diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame.png b/pending_check/gen_1/entity/textures/flame.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame.png
rename to pending_check/gen_1/entity/textures/flame.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_s.png b/pending_check/gen_1/entity/textures/flame_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_s.png
rename to pending_check/gen_1/entity/textures/flame_s.png
diff --git a/src/main/resources/assets/pokecube/entity/textures/missingno.png b/pending_check/gen_1/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/textures/missingno.png
rename to pending_check/gen_1/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/croconaw.x3d b/pending_check/gen_2/entity/models/croconaw.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/croconaw.x3d
rename to pending_check/gen_2/entity/models/croconaw.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/quilava.x3d b/pending_check/gen_2/entity/models/quilava.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/quilava.x3d
rename to pending_check/gen_2/entity/models/quilava.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quilava.xml b/pending_check/gen_2/entity/models/quilava.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quilava.xml
rename to pending_check/gen_2/entity/models/quilava.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/typhlosion.x3d b/pending_check/gen_2/entity/models/typhlosion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/typhlosion.x3d
rename to pending_check/gen_2/entity/models/typhlosion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion.xml b/pending_check/gen_2/entity/models/typhlosion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion.xml
rename to pending_check/gen_2/entity/models/typhlosion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/entity/textures/missingno.png b/pending_check/gen_2/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/entity/textures/missingno.png
rename to pending_check/gen_2/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/porygon2_s.png b/pending_check/gen_2/entity/textures/porygon2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/porygon2_s.png
rename to pending_check/gen_2/entity/textures/porygon2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/porygon2eye_s.png b/pending_check/gen_2/entity/textures/porygon2eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/porygon2eye_s.png
rename to pending_check/gen_2/entity/textures/porygon2eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/missingno.png b/pending_check/gen_3/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/missingno.png
rename to pending_check/gen_3/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/missingno.png b/pending_check/gen_4/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/missingno.png
rename to pending_check/gen_4/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame.png b/pending_check/gen_5/entity/textures/flame.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame.png
rename to pending_check/gen_5/entity/textures/flame.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_anim.png b/pending_check/gen_5/entity/textures/flame_anim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_anim.png
rename to pending_check/gen_5/entity/textures/flame_anim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_anim_s.png b/pending_check/gen_5/entity/textures/flame_anim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_anim_s.png
rename to pending_check/gen_5/entity/textures/flame_anim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/missingno.png b/pending_check/gen_5/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/missingno.png
rename to pending_check/gen_5/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/missingno.png b/pending_check/gen_6/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/missingno.png
rename to pending_check/gen_6/entity/textures/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/missingno.png b/pending_check/gen_7/entity/textures/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/missingno.png
rename to pending_check/gen_7/entity/textures/missingno.png
diff --git a/processing_scripts/database_update/moves_converter.py b/processing_scripts/database_update/moves_converter.py
index d54c5efb3d..8a1653f480 100644
--- a/processing_scripts/database_update/moves_converter.py
+++ b/processing_scripts/database_update/moves_converter.py
@@ -1,5 +1,7 @@
 import json
-from utils import get_moves_index, get_move, trim, default_or_latest
+import utils
+import os
+from utils import get_moves_index, get_move, trim, default_or_latest, url_to_id
 
 MANUAL_RENAMES = {
     "lastout": "lash-out",
@@ -49,6 +51,7 @@ def __init__(self, move) -> None:
         self.accuracy = move.accuracy
         self.target = move.target.name
         self.damage_class = move.damage_class.name
+        self.names = move.names
 
         flavor_text = default_or_latest(move.flavor_text_entries, is_english)
         if flavor_text is not None:
@@ -132,10 +135,24 @@ def convert_moves():
     for var in old_animations["moves"]:
         anims_dex[var["name"]] = var
 
+    lang_files = {}
+
     move_entries = []
     for name, index in index_map.items():
         move = get_move(index)
         entry = MoveEntry(move)
+
+        for __name in entry.names:
+            _name = __name.name
+            lang = utils.get('language', url_to_id(__name.language))
+            key = f'{lang.iso639}_{lang.iso3166}.json'
+            items = {}
+            if key in lang_files:
+                items = lang_files[key]
+            items[f"pokemob.move.{entry.name}"] = _name
+            lang_files[key] = items
+        del entry.names
+
         move_entries.append(entry)
 
         file = f'./new/moves/entries/{name}.json'
@@ -143,6 +160,19 @@ def convert_moves():
         json.dump(entry.__dict__, file, indent=2, ensure_ascii=False)
         file.close()
 
+
+    for key, dict in lang_files.items():
+        file = f'./new/assets/pokecube_moves/lang/{key}'
+        if not os.path.exists(os.path.dirname(file)):
+            os.makedirs(os.path.dirname(file))
+        try:
+            file = open(file, 'w', encoding='utf-8')
+            json.dump(dict, file, indent=2, ensure_ascii=False)
+            file.close()
+        except Exception as err:
+            print(f'error saving for {key}')
+            print(err)
+
     for name, value in anims_dex.items():
         new_name = convert_old_move_name(name)
         if new_name is not None:
diff --git a/processing_scripts/database_update/pokedex_converter.py b/processing_scripts/database_update/pokedex_converter.py
index edfb2d0dff..4448b6830d 100644
--- a/processing_scripts/database_update/pokedex_converter.py
+++ b/processing_scripts/database_update/pokedex_converter.py
@@ -2,7 +2,7 @@
 from ignore_list import isIgnored
 from legacy_renamer import find_old_name, to_model_form, find_new_name
 import utils
-from utils import get_form, get_pokemon, get_species, DEFAULT_GENERATION, default_or_latest, get_pokemon_index, url_to_id
+from utils import get_form, get_pokemon, get_species, default_or_latest, get_pokemon_index, url_to_id
 from moves_converter import convert_old_move_name
 import os
 from glob import glob
@@ -436,7 +436,7 @@ def convert_moves(old_moves, name):
         values = get_species(i)
 
     for key, dict in lang_files.items():
-        file = f'./new/lang/{key}'
+        file = f'./new/assets/pokecube_mobs/lang/{key}'
         if not os.path.exists(os.path.dirname(file)):
             os.makedirs(os.path.dirname(file))
         try:
@@ -471,4 +471,4 @@ def convert_moves(old_moves, name):
 if __name__ == "__main__":
     convert_pokedex()
     convert_tags()
-    # convert_assets()
\ No newline at end of file
+    convert_assets()
\ No newline at end of file
diff --git a/src/main/java/pokecube/api/data/PokedexEntry.java b/src/main/java/pokecube/api/data/PokedexEntry.java
index c61108428a..0573788fa8 100644
--- a/src/main/java/pokecube/api/data/PokedexEntry.java
+++ b/src/main/java/pokecube/api/data/PokedexEntry.java
@@ -764,7 +764,8 @@ public void postInit()
         }
     }
 
-    public static final String TEXTUREPATH = "entity/textures/";
+    public static final String TEXTUREPATH = "textures/entity/pokemob/";
+    public static final String MODELPATH = "models/entity/pokemob/";
 
     public static TimePeriod dawn = new TimePeriod(0.85, 0.05);
     public static TimePeriod day = new TimePeriod(0.0, 0.5);
@@ -773,11 +774,10 @@ public void postInit()
 
     private static final PokedexEntry BLANK = new PokedexEntry(true);
 
-    public static final ResourceLocation MODELNO = new ResourceLocation(PokecubeCore.MODID, "entity/models/missingno");
+    public static final ResourceLocation MODELNO = new ResourceLocation(PokecubeCore.MODID, MODELPATH + "missingno");
     public static final ResourceLocation TEXNO = new ResourceLocation(PokecubeCore.MODID,
-            "entity/textures/missingno.png");
-    public static final ResourceLocation ANIMNO = new ResourceLocation(PokecubeCore.MODID,
-            "entity/animations/missingno.xml");
+            TEXTUREPATH + "missingno.png");
+    public static final ResourceLocation ANIMNO = new ResourceLocation(PokecubeCore.MODID, MODELPATH + "missingno.xml");
 
     private static void addFromEvolution(final PokedexEntry a, final PokedexEntry b)
     {
diff --git a/src/main/java/pokecube/core/client/render/mobs/RenderEgg.java b/src/main/java/pokecube/core/client/render/mobs/RenderEgg.java
index 428cde46eb..d90cbab6af 100644
--- a/src/main/java/pokecube/core/client/render/mobs/RenderEgg.java
+++ b/src/main/java/pokecube/core/client/render/mobs/RenderEgg.java
@@ -40,9 +40,9 @@
 public class RenderEgg extends LivingEntityRenderer<EntityPokemobEgg, ModelWrapper<EntityPokemobEgg>>
         implements IModelRenderer<EntityPokemobEgg>
 {
-    static final ResourceLocation TEXTURE = new ResourceLocation(PokecubeCore.MODID, "entity/textures/egg.png");
-    static final ResourceLocation MODEL = new ResourceLocation(PokecubeCore.MODID, "entity/models/egg");
-    static final ResourceLocation ANIM = new ResourceLocation(PokecubeCore.MODID, "entity/animations/egg.xml");
+    static final ResourceLocation TEXTURE = new ResourceLocation(PokecubeCore.MODID, "textures/entity/egg/egg.png");
+    static final ResourceLocation MODEL = new ResourceLocation(PokecubeCore.MODID, "models/entity/egg/egg");
+    static final ResourceLocation ANIM = new ResourceLocation(PokecubeCore.MODID, "models/entity/egg/egg.xml");
 
     private static class EggColourer implements IAnimationChanger
     {
diff --git a/src/main/java/pokecube/core/client/render/mobs/RenderPokemob.java b/src/main/java/pokecube/core/client/render/mobs/RenderPokemob.java
index 1434463ce4..683772d80c 100644
--- a/src/main/java/pokecube/core/client/render/mobs/RenderPokemob.java
+++ b/src/main/java/pokecube/core/client/render/mobs/RenderPokemob.java
@@ -475,6 +475,7 @@ public void render(final Mob entity, final float entityYaw, final float partialT
             }
             holder = temp;
         }
+        
         if (holder.wrapper == null || !holder.wrapper.isLoaded())
         {
             holder.init();
diff --git a/src/main/java/pokecube/core/database/pokedex/JsonPokedexEntry.java b/src/main/java/pokecube/core/database/pokedex/JsonPokedexEntry.java
index 8ca0e49252..b7917be211 100644
--- a/src/main/java/pokecube/core/database/pokedex/JsonPokedexEntry.java
+++ b/src/main/java/pokecube/core/database/pokedex/JsonPokedexEntry.java
@@ -266,6 +266,9 @@ public void accept(PokedexEntry entry)
 
     private void initStage2(PokedexEntry entry)
     {
+        // This can be the case if the entry was removed earlier.
+        if (entry == null) return;
+
         if (this.interactions != null) entry._loaded_interactions.addAll(this.interactions);
         if (this.mega_rules != null) entry._loaded_megarules.addAll(this.mega_rules);
 
@@ -297,6 +300,8 @@ private void initStage2(PokedexEntry entry)
             entry.model = new ResourceLocation(model + entry.getTrimmedName() + entry.modelExt);
             entry.texture = new ResourceLocation(tex + entry.getTrimmedName() + ".png");
             entry.animation = new ResourceLocation(anim + entry.getTrimmedName() + ".xml");
+
+            PokecubeAPI.LOGGER.info("Paths for {}: {} {} {}", entry.model, entry.texture, entry.animation);
         }
 
         if (this.pose_shapes != null && !this.pose_shapes.isEmpty())
diff --git a/src/main/java/pokecube/core/database/pokedex/PokedexEntryLoader.java b/src/main/java/pokecube/core/database/pokedex/PokedexEntryLoader.java
index c443771426..c9cdecd504 100644
--- a/src/main/java/pokecube/core/database/pokedex/PokedexEntryLoader.java
+++ b/src/main/java/pokecube/core/database/pokedex/PokedexEntryLoader.java
@@ -652,7 +652,8 @@ public static void initFormeModels(final PokedexEntry entry, final List<DefaultF
         for (final DefaultFormeHolder holder : list)
         {
             holder.getForme(entry);
-            PokecubeAPI.LOGGER.debug("Loaded Forme: " + holder.key + " " + holder.model + " " + holder.tex);
+            if (PokecubeMod.debug)
+                PokecubeAPI.LOGGER.debug("Loaded Forme: " + holder.key + " " + holder.model + " " + holder.tex);
         }
     }
 
diff --git a/src/main/java/pokecube/core/entity/npc/NpcType.java b/src/main/java/pokecube/core/entity/npc/NpcType.java
index 9226b7c62a..b237c6d3fe 100644
--- a/src/main/java/pokecube/core/entity/npc/NpcType.java
+++ b/src/main/java/pokecube/core/entity/npc/NpcType.java
@@ -183,8 +183,8 @@ public NpcType(String string)
 
         // We will set these as a default here, sub-classes can replace them
         // later, or by calling their setters.
-        this.maleTex = new ResourceLocation(PokecubeMod.ID + ":textures/entity/" + string + "_male.png");
-        this.femaleTex = new ResourceLocation(PokecubeMod.ID + ":textures/entity/" + string + "_female.png");
+        this.maleTex = new ResourceLocation(PokecubeMod.ID + ":textures/entity/npc/" + string + "_male.png");
+        this.femaleTex = new ResourceLocation(PokecubeMod.ID + ":textures/entity/npc/" + string + "_female.png");
 
         if (ForgeRegistries.PROFESSIONS.containsKey(new ResourceLocation(string)))
         {
diff --git a/src/main/java/pokecube/mobs/PokecubeMobs.java b/src/main/java/pokecube/mobs/PokecubeMobs.java
index 20b10fa7ae..fbb2327dd5 100644
--- a/src/main/java/pokecube/mobs/PokecubeMobs.java
+++ b/src/main/java/pokecube/mobs/PokecubeMobs.java
@@ -29,7 +29,6 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import pokecube.api.PokecubeAPI;
 import pokecube.api.data.PokedexEntry;
-import pokecube.api.data.PokedexEntry.EvolutionData;
 import pokecube.api.entity.pokemob.IPokemob;
 import pokecube.api.entity.pokemob.IPokemob.Stats;
 import pokecube.api.entity.pokemob.PokemobCaps;
@@ -110,88 +109,6 @@ public void evolveTyrogue(final EvolveEvent.Pre evt)
         }
     }
 
-    private int getGen(PokedexEntry entry)
-    {
-        int gen;
-        if (this.genMap.containsKey(entry)) gen = this.genMap.get(entry);
-        else
-        {
-            gen = entry.getGen();
-            final PokedexEntry real = entry;
-            if (entry.getBaseForme() != null) entry = entry.getBaseForme();
-            for (final EvolutionData d : entry.getEvolutions())
-            {
-                int gen1 = d.evolution.getGen();
-                if (this.genMap.containsKey(d.evolution)) gen1 = this.genMap.get(d.evolution);
-                if (gen1 < gen) gen = gen1;
-                for (final EvolutionData d1 : d.evolution.getEvolutions())
-                {
-                    gen1 = d1.evolution.getGen();
-                    if (this.genMap.containsKey(d1.evolution)) gen1 = this.genMap.get(d1.evolution);
-                    if (d.evolution == entry && gen1 < gen) gen = gen1;
-                }
-            }
-            for (final PokedexEntry e : Database.getSortedFormes())
-            {
-                int gen1 = e.getGen();
-                if (this.genMap.containsKey(e)) gen1 = this.genMap.get(e);
-                for (final EvolutionData d : e.getEvolutions()) if (d.evolution == entry && gen1 < gen) gen = gen1;
-            }
-            this.genMap.put(real, gen);
-        }
-        return gen;
-    }
-
-    public String getModelDirectory(final PokedexEntry entry)
-    {
-        final int gen = this.getGen(entry);
-        switch (gen)
-        {
-        case 1:
-            return "gen_1/entity/models/";
-        case 2:
-            return "gen_2/entity/models/";
-        case 3:
-            return "gen_3/entity/models/";
-        case 4:
-            return "gen_4/entity/models/";
-        case 5:
-            return "gen_5/entity/models/";
-        case 6:
-            return "gen_6/entity/models/";
-        case 7:
-            return "gen_7/entity/models/";
-        case 8:
-            return "gen_8/entity/models/";
-        }
-        return "entity/models/";
-    }
-
-    public String getTextureDirectory(final PokedexEntry entry)
-    {
-        final int gen = this.getGen(entry);
-        switch (gen)
-        {
-        case 1:
-            return "gen_1/entity/textures/";
-        case 2:
-            return "gen_2/entity/textures/";
-        case 3:
-            return "gen_3/entity/textures/";
-        case 4:
-            return "gen_4/entity/textures/";
-        case 5:
-            return "gen_5/entity/textures/";
-        case 6:
-            return "gen_6/entity/textures/";
-        case 7:
-            return "gen_7/entity/textures/";
-        case 8:
-            return "gen_8/entity/textures/";
-        }
-        return "entity/textures/";
-    }
-
     @SubscribeEvent
     public void livingUpdate(final LivingUpdateEvent evt)
     {
@@ -695,8 +612,8 @@ public void RegisterPokemobsEvent(final RegisterPokemobsEvent.Register event)
         {
             if (entry == Database.missingno) continue;
             if (entry.model != PokedexEntry.MODELNO) continue;
-            final String tex = this.getTextureDirectory(entry);
-            final String model = this.getModelDirectory(entry);
+            final String tex = PokedexEntry.TEXTUREPATH;
+            final String model = PokedexEntry.MODELPATH;
             entry.setModId(PokecubeMobs.MODID);
             entry.texturePath = PokecubeMobs.MODID + ":" + tex;
             entry.model = new ResourceLocation(PokecubeMobs.MODID, model + entry.getTrimmedName() + entry.modelExt);
diff --git a/src/main/resources/assets/pokecube/lang/en_us.json b/src/main/resources/assets/pokecube/lang/en_us.json
index 018873edf6..0bec4dddbb 100644
--- a/src/main/resources/assets/pokecube/lang/en_us.json
+++ b/src/main/resources/assets/pokecube/lang/en_us.json
@@ -1,6 +1,91 @@
 {
     "_comment": "Pokécube translation",
 
+    "_comment": "#Move Messages",
+
+    "pokemob.status.curse.user": "%1$s §cwas hurt by the curse",
+    "pokemob.status.flinch.user": "%1$s §cflinched",
+    "pokemob.status.confuse.add.user": "%1$s §cis confused",
+    "pokemob.status.confuse.remove.user": "%1$s §ais no longer confused",
+    "pokemob.status.confusion.user": "%1$s §churt itself in confusion",
+    "pokemob.status.infatuate.user": "%1$s §cis immobilized by love",
+    "pokemob.move.stat.fail.user": "§cThe status effect failed!",
+
+    "pokemob.status.curse.target": "%1$s §awas hurt by the curse",
+    "pokemob.status.flinch.target": "%1$s §aflinched",
+    "pokemob.status.confuse.add.target": "%1$s §ais confused",
+    "pokemob.status.confuse.remove.target": "%1$s §cis no longer confused",
+    "pokemob.status.confusion.target": "%1$s §ahurt itself in confusion",
+    "pokemob.status.infatuate.target": "%1$s §ais immobilized by love",
+    "pokemob.move.stat.fail.target": "§aThe status effect failed!",
+
+    "pokemob.move.super.effective.user": "§aIt's super effective!",
+    "pokemob.move.not.very.effective.user": "§cIt's not very effective!",
+    "pokemob.move.doesnt.affect.user": "§cIt doesn't affect§r %1$s!",
+    "pokemob.move.critical.hit.user": "§aCritical hit!",
+
+    "pokemob.move.super.effective.target": "§cIt's super effective!",
+    "pokemob.move.not.very.effective.target": "§aIt's not very effective!",
+    "pokemob.move.doesnt.affect.target": "§aIt doesn't affect§r %1$s!",
+    "pokemob.move.critical.hit.target": "§cCritical hit!",
+    
+    "pokemob.move.used.user": "%1$s §aused §c%2$s!",
+    "pokemob.move.used.target": "%1$s §cenemy used §6%2$s!",
+    
+    "pokemob.move.stat.fail.user": "§cBut it failed",
+    "pokemob.move.stat.rise1.user": "%1$s's §6%2$s §arose",
+    "pokemob.move.stat.rise2.user": "%1$s's §6%2$s §asharply rose",
+    "pokemob.move.stat.rise3.user": "%1$s's §6%2$s §adrastically rose",
+    "pokemob.move.stat.fall1.user": "%1$s's §6%2$s §cfell",
+    "pokemob.move.stat.fall2.user": "%1$s's §6%2$s §charshly fell",
+    "pokemob.move.stat.fall3.user": "%1$s's §6%2$s §cdrastically fell",
+    
+    "pokemob.move.stat.fail.target": "§aBut it failed",
+    "pokemob.move.stat.rise1.target": "%1$s's §6%2$s §crose",
+    "pokemob.move.stat.rise2.target": "%1$s's §6%2$s §csharply rose",
+    "pokemob.move.stat.rise3.target": "%1$s's §6%2$s §cdrastically rose",
+    "pokemob.move.stat.fall1.target": "%1$s's §6%2$s §afell",
+    "pokemob.move.stat.fall2.target": "%1$s's §6%2$s §aharshly fell",
+    "pokemob.move.stat.fall3.target": "%1$s's §6%2$s §adrastically fell",
+
+    "pokemob.move.stat1": "Attack",
+    "pokemob.move.stat2": "Defense",
+    "pokemob.move.stat3": "Special Attack",
+    "pokemob.move.stat4": "Special Defense",
+    "pokemob.move.stat5": "Speed",
+    "pokemob.move.stat6": "Accuracy",
+    "pokemob.move.stat7": "Evasion",
+
+    "pokemob.move.notify.learn": "%1$s Learned %2$s",
+    "pokemob.move.terraindamage": "%1$s was hurt by the %2$s",
+
+    "pokemob.move.missed.user": "§cIt missed§r %1$s!",
+    "pokemob.move.missed.target": "§aIt missed§r %1$s!",
+
+    "pokemob.move.failed.user": "%1$s's §cattack failed!",
+    "pokemob.move.failed.target": "%1$s's §aattack failed!",
+
+    "pokemob.move.isfrozen.user": "%1$s §cis frozen.",
+    "pokemob.move.issleeping.user": "%1$s §cis sleeping.",
+    "pokemob.move.isfullyparalyzed.user": "%1$s §cis fully paralyzed.",
+    "pokemob.move.paralyzed.user": "%1$s §cis paralyzed.",
+    "pokemob.move.isburned.user": "%1$s §cis burned.",
+    "pokemob.move.ispoisoned.user": "%1$s §cis poisoned.",
+    "pokemob.move.isbadlypoisoned.user": "%1$s §cis badly poisoned.",
+
+    "pokemob.move.isfrozen.target": "%1$s §ais frozen.",
+    "pokemob.move.issleeping.target": "%1$s §ais sleeping.",
+    "pokemob.move.isfullyparalyzed.target": "%1$s §ais fully paralyzed.",
+    "pokemob.move.paralyzed.target": "%1$s §ais paralyzed.",
+    "pokemob.move.isburned.target": "%1$s §ais burned.",
+    "pokemob.move.ispoisoned.target": "%1$s §ais poisoned.",
+    "pokemob.move.isbadlypoisoned.target": "%1$s §ais badly poisoned.",
+
+    "pokemob.move.sketched": "%1$s Sketched %2$s",
+
+    "pokemob.move.cooldown": "%1$s §ccannot use %2$s §cright now.",
+
+
     "_comment": "Key Bindings",
     
     "key.pokemob.next": "Next Pokémob",
diff --git a/src/main/resources/assets/pokecube/lang/zh_cn.json b/src/main/resources/assets/pokecube/lang/zh_cn.json
index 4a5a112b2c..34ec626062 100644
--- a/src/main/resources/assets/pokecube/lang/zh_cn.json
+++ b/src/main/resources/assets/pokecube/lang/zh_cn.json
@@ -1,4 +1,71 @@
 {
+    "_comment": "#Move Names",
+    "pokemob.status.curse.user": "%1$s §c被诅咒伤害了！",
+    "pokemob.status.flinch.user": "%1$s §c退缩了！",
+    "pokemob.status.confuse.add.user": "%1$s §c混乱了！",
+    "pokemob.status.confuse.remove.user": "%1$s §a从混乱中解除了。",
+    "pokemob.status.confusion.user": "%1$s §c混乱了，自己受伤害了！",
+    "pokemob.status.infatuate.user": "%1$s §c被迷倒了。",
+    "pokemob.move.stat.fail.user": "§c但是它失败了。",
+    "pokemob.status.curse.target": "%1$s §c被诅咒伤害了！",
+    "pokemob.status.flinch.target": "%1$s §c退缩了！",
+    "pokemob.status.confuse.add.target": "%1$s §c混乱了！",
+    "pokemob.status.confuse.remove.target": "%1$s §a从混乱中解除了。",
+    "pokemob.status.confusion.target": "%1$s §c混乱了，自己受伤害了！",
+    "pokemob.status.infatuate.target": "%1$s §c被迷倒了。",
+    "pokemob.move.stat.fail.target": "§c但是它失败了。",
+    "pokemob.move.super.effective.user": "§a效果绝佳！",
+    "pokemob.move.not.very.effective.user": "§c效果不好...",
+    "pokemob.move.doesnt.affect.user": "§c对 %1$s 没有效果！",
+    "pokemob.move.critical.hit.user": "§a击中要害！",
+    "pokemob.move.super.effective.target": "§a效果绝佳！",
+    "pokemob.move.not.very.effective.target": "§c效果不好...",
+    "pokemob.move.doesnt.affect.target": "§c对 %1$s 没有效果！",
+    "pokemob.move.critical.hit.target": "§a击中要害！",
+    "pokemob.move.used.user": "%1$s 使用 %2$s!",
+    "pokemob.move.used.target": "敌方 %1$s 使用 %2$s!",
+    "pokemob.move.stat.rise1.user": "%1$s的 §6%2$s §a上升了。",
+    "pokemob.move.stat.rise2.user": "%1$s的 §6%2$s §a急速上升。",
+    "pokemob.move.stat.rise3.user": "%1$s的 §6%2$s §a大幅度上升。",
+    "pokemob.move.stat.fall1.user": "%1$s的 §6%2$s §c下降了。",
+    "pokemob.move.stat.fall2.user": "%1$s的 §6%2$s §c急速下降。",
+    "pokemob.move.stat.fall3.user": "%1$s的 §6%2$s §c大幅度下降。",
+    "pokemob.move.stat.rise1.target": "%1$s的 §6%2$s §a上升了。",
+    "pokemob.move.stat.rise2.target": "%1$s的 §6%2$s §a急速上升。",
+    "pokemob.move.stat.rise3.target": "%1$s的 §6%2$s §a大幅度上升。",
+    "pokemob.move.stat.fall1.target": "%1$s的 §6%2$s §c下降了。",
+    "pokemob.move.stat.fall2.target": "%1$s的 §6%2$s §c急速下降。",
+    "pokemob.move.stat.fall3.target": "%1$s的 §6%2$s §c大幅度下降。",
+    "pokemob.move.stat1": "物攻",
+    "pokemob.move.stat2": "物防",
+    "pokemob.move.stat3": "特攻",
+    "pokemob.move.stat4": "特防",
+    "pokemob.move.stat5": "速度",
+    "pokemob.move.stat6": "命中率",
+    "pokemob.move.stat7": "闪避率",
+    "pokemob.move.notify.learn": "%1$s 学会了 %2$s ！",
+    "pokemob.move.terraindamage": "%1$s 受到了%2$s的伤害。",
+    "pokemob.move.missed.user": "§c没有打中§r %1$s!",
+    "pokemob.move.missed.target": "§c没有打中§r %1$s!",
+    "pokemob.move.failed.user": "%1$s的 §c攻击失败!",
+    "pokemob.move.failed.target": "%1$s的 §a攻击失败!",
+    "pokemob.move.isfrozen.user": "%1$s §c被冰冻。",
+    "pokemob.move.issleeping.user": "%1$s §c在睡觉。",
+    "pokemob.move.isfullyparalyzed.user": "%1$s §c完全麻痹了。",
+    "pokemob.move.paralyzed.user": "%1$s §c麻痹了。",
+    "pokemob.move.isburned.user": "%1$s §c被烧伤。",
+    "pokemob.move.ispoisoned.user": "%1$s §c中毒了。",
+    "pokemob.move.isbadlypoisoned.user": "%1$s §c中了猛毒。",
+    "pokemob.move.isfrozen.target": "%1$s §c被冰冻。",
+    "pokemob.move.issleeping.target": "%1$s §c在睡觉。",
+    "pokemob.move.isfullyparalyzed.target": "%1$s §c完全麻痹了。",
+    "pokemob.move.paralyzed.target": "%1$s §c麻痹了。",
+    "pokemob.move.isburned.target": "%1$s §c被烧伤。",
+    "pokemob.move.ispoisoned.target": "%1$s §c中毒了。",
+    "pokemob.move.isbadlypoisoned.target": "%1$s §c中了猛毒。",
+    "pokemob.move.sketched": "%1$s 勾勒出 %2$s",
+    "pokemob.move.cooldown": "%1$s §c不能马上使用 %2$s 。",
+
     "_comment": "杂项",
     "achievement.pokecube.catch": "收服了 %1$s",
     "achievement.pokecube.catch.desc": "收服一只 %1$s",
diff --git a/src/main/resources/assets/pokecube/entity/models/egg.x3d b/src/main/resources/assets/pokecube/models/entity/egg/egg.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/models/egg.x3d
rename to src/main/resources/assets/pokecube/models/entity/egg/egg.x3d
diff --git a/src/main/resources/assets/pokecube/entity/animations/egg.xml b/src/main/resources/assets/pokecube/models/entity/egg/egg.xml
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/animations/egg.xml
rename to src/main/resources/assets/pokecube/models/entity/egg/egg.xml
diff --git a/src/main/resources/assets/pokecube/entity/models/missingno.x3d b/src/main/resources/assets/pokecube/models/entity/pokemob/missingno.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/models/missingno.x3d
rename to src/main/resources/assets/pokecube/models/entity/pokemob/missingno.x3d
diff --git a/src/main/resources/assets/pokecube/entity/animations/missingno.xml b/src/main/resources/assets/pokecube/models/entity/pokemob/missingno.xml
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/animations/missingno.xml
rename to src/main/resources/assets/pokecube/models/entity/pokemob/missingno.xml
diff --git a/src/main/resources/assets/pokecube/entity/textures/egg.png b/src/main/resources/assets/pokecube/textures/entity/egg/egg.png
similarity index 100%
rename from src/main/resources/assets/pokecube/entity/textures/egg.png
rename to src/main/resources/assets/pokecube/textures/entity/egg/egg.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/healer_female.png b/src/main/resources/assets/pokecube/textures/entity/npc/healer_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/healer_female.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/healer_female.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/healer_male.png b/src/main/resources/assets/pokecube/textures/entity/npc/healer_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/healer_male.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/healer_male.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/professor_female.png b/src/main/resources/assets/pokecube/textures/entity/npc/professor_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/professor_female.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/professor_female.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/professor_male.png b/src/main/resources/assets/pokecube/textures/entity/npc/professor_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/professor_male.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/professor_male.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/trader_female.png b/src/main/resources/assets/pokecube/textures/entity/npc/trader_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/trader_female.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/trader_female.png
diff --git a/src/main/resources/assets/pokecube/textures/entity/trader_male.png b/src/main/resources/assets/pokecube/textures/entity/npc/trader_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube/textures/entity/trader_male.png
rename to src/main/resources/assets/pokecube/textures/entity/npc/trader_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/missingno.png b/src/main/resources/assets/pokecube/textures/entity/pokemob/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/missingno.png
rename to src/main/resources/assets/pokecube/textures/entity/pokemob/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim.png b/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim.png
deleted file mode 100644
index 42dee9ac77..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_s.png b/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_s.png
deleted file mode 100644
index 17827754bc..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesect.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesect.png
deleted file mode 100644
index d984e581c4..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesect.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive.png
deleted file mode 100644
index 6645164193..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive_s.png
deleted file mode 100644
index bf681e436e..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectbdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive.png
deleted file mode 100644
index bde9e153d9..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive_s.png
deleted file mode 100644
index 071208498e..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectcdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive.png
deleted file mode 100644
index 1dc7098ca9..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive_s.png
deleted file mode 100644
index c4c863c226..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectddrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectsdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectsdrive_s.png
deleted file mode 100644
index 870d6586c4..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectsdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesect.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesect.png
deleted file mode 100644
index 64a7700707..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesect.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive.png
deleted file mode 100644
index 825a555234..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive_s.png
deleted file mode 100644
index 080f84bea9..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectbdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive.png
deleted file mode 100644
index 0618a38699..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive_s.png
deleted file mode 100644
index 2cfbc58e17..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectcdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive.png
deleted file mode 100644
index 35b06f5aeb..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive_s.png
deleted file mode 100644
index a12595e908..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectddrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectsdrive_s.png b/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectsdrive_s.png
deleted file mode 100644
index 27a84d81d3..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectsdrive_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_s.png b/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_s.png
deleted file mode 100644
index f0aefbfa3e..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_s.png and /dev/null differ
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/missingno.png b/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/missingno.png
deleted file mode 100644
index d662edfd08..0000000000
Binary files a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/missingno.png and /dev/null differ
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/de_de.json b/src/main/resources/assets/pokecube_mobs/lang/de_de.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/de_de.json
rename to src/main/resources/assets/pokecube_mobs/lang/de_de.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/en_us.json b/src/main/resources/assets/pokecube_mobs/lang/en_us.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/en_us.json
rename to src/main/resources/assets/pokecube_mobs/lang/en_us.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/es_es.json b/src/main/resources/assets/pokecube_mobs/lang/es_es.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/es_es.json
rename to src/main/resources/assets/pokecube_mobs/lang/es_es.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json b/src/main/resources/assets/pokecube_mobs/lang/fr_fr.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/fr_fr.json
rename to src/main/resources/assets/pokecube_mobs/lang/fr_fr.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/it_it.json b/src/main/resources/assets/pokecube_mobs/lang/it_it.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/it_it.json
rename to src/main/resources/assets/pokecube_mobs/lang/it_it.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json b/src/main/resources/assets/pokecube_mobs/lang/ja_jp.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/ja_jp.json
rename to src/main/resources/assets/pokecube_mobs/lang/ja_jp.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json b/src/main/resources/assets/pokecube_mobs/lang/ko_kr.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/ko_kr.json
rename to src/main/resources/assets/pokecube_mobs/lang/ko_kr.json
diff --git a/src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json b/src/main/resources/assets/pokecube_mobs/lang/zh_cn.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/lang/zh_cn.json
rename to src/main/resources/assets/pokecube_mobs/lang/zh_cn.json
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/abomasnow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abomasnow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/abra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/abra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/absol.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/absol.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/accelgor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/accelgor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/accelgor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/accelgor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/accelgor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/accelgor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/accelgor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/accelgor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-blade.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-blade.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-blade.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-blade.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-blade.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-blade.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-blade.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-blade.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-shield.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-shield.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-shield.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-shield.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-shield.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-shield.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aegislash-shield.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aegislash-shield.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/aerodactyl.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aerodactyl.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aggron.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aggron.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/aipom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aipom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/aipom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aipom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/aipom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aipom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/aipom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aipom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/alakazam_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alakazam_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/alcremie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alcremie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/alomomola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alomomola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/alomomola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alomomola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/alomomola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alomomola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/alomomola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/alomomola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/altaria.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/altaria.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/amaura.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amaura.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/amaura.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amaura.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/amaura.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amaura.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/amaura.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amaura.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ambipom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ambipom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ambipom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ambipom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ambipom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ambipom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ambipom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ambipom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/amoonguss.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amoonguss.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/amoonguss.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amoonguss.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/amoonguss.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amoonguss.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/amoonguss.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/amoonguss.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ampharos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ampharos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/anorith.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/anorith.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/anorith.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/anorith.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/anorith.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/anorith.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/anorith.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/anorith.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/appletun.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/appletun.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/applin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/applin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/applin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/applin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/applin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/applin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/applin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/applin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/araquanid.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/araquanid.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/araquanid.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/araquanid.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/araquanid.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/araquanid.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/araquanid.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/araquanid.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arbok.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arbok.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arbok.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arbok.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arbok.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arbok.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arbok.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arbok.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/arcanine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arcanine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_bug.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_bug.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_bug.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_bug.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_dark.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_dark.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_dark.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_dark.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_dragon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_dragon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_dragon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_dragon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_electric.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_electric.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_electric.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_electric.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_fighting.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_fighting.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_fighting.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_fighting.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_fire.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_fire.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_fire.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_fire.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_flying.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_flying.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_flying.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_flying.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ghost.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ghost.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ghost.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ghost.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_grass.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_grass.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_grass.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_grass.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ground.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ground.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ground.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ground.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ice.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_ice.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_ice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_poison.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_poison.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_poison.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_poison.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_psychic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_psychic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_psychic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_psychic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_rock.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_rock.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_rock.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_rock.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_steel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_steel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_steel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_steel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_water.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_water.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/arceus_water.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arceus_water.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archeops.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archeops.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archeops.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archeops.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archeops.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archeops.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/archeops.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/archeops.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctovish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctovish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctovish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctovish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctovish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctovish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctovish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctovish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctozolt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctozolt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctozolt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctozolt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctozolt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctozolt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arctozolt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arctozolt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ariados.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ariados.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ariados.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ariados.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ariados.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ariados.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ariados.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ariados.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/armaldo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/armaldo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/armaldo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/armaldo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/armaldo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/armaldo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/armaldo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/armaldo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aromatisse.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aromatisse.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aromatisse.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aromatisse.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aromatisse.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aromatisse.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aromatisse.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aromatisse.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aron.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aron.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aron.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aron.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aron.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aron.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/aron.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aron.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arrokuda.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arrokuda.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arrokuda.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arrokuda.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arrokuda.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arrokuda.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/arrokuda.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/arrokuda.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/articuno.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/articuno.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/audino.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/audino.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aurorus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aurorus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aurorus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aurorus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aurorus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aurorus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/aurorus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/aurorus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/avalugg.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/avalugg.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/axew.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/axew.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/axew.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/axew.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/axew.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/axew.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/axew.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/axew.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/azelf.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azelf.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/azelf.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azelf.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/azelf.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azelf.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/azelf.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azelf.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azumarill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azumarill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azumarill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azumarill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azumarill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azumarill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azumarill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azumarill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azurill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azurill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azurill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azurill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azurill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azurill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/azurill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/azurill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/bagon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bagon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/bagon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bagon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/bagon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bagon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/bagon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bagon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/baltoy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/baltoy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/baltoy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/baltoy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/baltoy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/baltoy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/baltoy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/baltoy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/banette.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/banette.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/barbaracle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barbaracle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/barbaracle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barbaracle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/barbaracle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barbaracle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/barbaracle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barbaracle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/barboach.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barboach.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/barboach.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barboach.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/barboach.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barboach.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/barboach.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barboach.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/barraskewda.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barraskewda.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/barraskewda.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barraskewda.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/barraskewda.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barraskewda.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/barraskewda.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/barraskewda.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculegion-male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculegion-male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin-white-striped.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin-white-striped.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin-white-striped.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin-white-striped.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_blue.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_blue.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_blue.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_blue.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_blue.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_blue.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_blue.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_blue.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_red.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_red.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_red.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_red.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_red.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_red.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/basculin_red.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/basculin_red.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bastiodon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bastiodon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bastiodon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bastiodon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bastiodon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bastiodon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bastiodon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bastiodon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bayleef.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bayleef.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bayleef.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bayleef.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bayleef.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bayleef.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bayleef.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bayleef.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beartic.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beartic.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beartic.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beartic.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beartic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beartic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beartic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beartic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beautifly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beautifly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beautifly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beautifly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beautifly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beautifly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beautifly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beautifly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/beedrill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beedrill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beheeyem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beheeyem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beheeyem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beheeyem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beheeyem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beheeyem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/beheeyem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beheeyem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beldum.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beldum.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beldum.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beldum.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beldum.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beldum.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/beldum.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/beldum.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellossom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellossom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellossom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellossom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellossom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellossom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellossom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellossom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellsprout.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellsprout.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellsprout.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellsprout.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellsprout.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellsprout.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bellsprout.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bellsprout.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bergmite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bergmite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bergmite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bergmite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bergmite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bergmite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bergmite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bergmite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bewear.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bewear.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bewear.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bewear.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bewear.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bewear.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bewear.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bewear.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bibarel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bibarel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bibarel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bibarel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bibarel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bibarel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bibarel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bibarel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bidoof.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bidoof.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bidoof.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bidoof.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bidoof.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bidoof.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bidoof.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bidoof.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/binacle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/binacle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/binacle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/binacle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/binacle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/binacle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/binacle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/binacle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bisharp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bisharp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bisharp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bisharp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bisharp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bisharp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bisharp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bisharp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/blacephalon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blacephalon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/blacephalon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blacephalon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/blacephalon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blacephalon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/blacephalon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blacephalon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blastoise.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blastoise.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/blaziken_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blaziken_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/blipbug.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blipbug.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/blipbug.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blipbug.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/blipbug.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blipbug.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/blipbug.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blipbug.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blissey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blissey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blissey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blissey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blissey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blissey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/blissey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blissey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/blitzle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blitzle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/blitzle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blitzle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/blitzle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blitzle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/blitzle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/blitzle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/boldore.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boldore.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/boldore.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boldore.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/boldore.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boldore.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/boldore.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boldore.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/boltund.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boltund.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/boltund.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boltund.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/boltund.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boltund.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/boltund.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/boltund.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bonsly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bonsly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bonsly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bonsly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bonsly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bonsly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/bonsly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bonsly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bouffalant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bouffalant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bouffalant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bouffalant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bouffalant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bouffalant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/bouffalant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bouffalant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bounsweet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bounsweet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bounsweet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bounsweet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bounsweet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bounsweet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bounsweet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bounsweet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/braixen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braixen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/braixen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braixen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/braixen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braixen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/braixen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braixen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/braviary.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/braviary.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/breloom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/breloom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/breloom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/breloom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/breloom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/breloom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/breloom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/breloom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/brionne.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/brionne.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/brionne.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/brionne.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/brionne.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/brionne.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/brionne.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/brionne.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzong.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzong.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzong.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzong.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzong.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzong.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzong.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzong.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/bronzor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bronzor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bruxish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bruxish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bruxish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bruxish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bruxish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bruxish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/bruxish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bruxish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/budew.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/budew.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/budew.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/budew.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/budew.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/budew.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/budew.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/budew.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buizel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buizel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buizel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buizel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buizel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buizel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buizel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buizel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bulbasaur.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bulbasaur.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bulbasaur.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bulbasaur.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bulbasaur.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bulbasaur.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/bulbasaur.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bulbasaur.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buneary.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buneary.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buneary.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buneary.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buneary.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buneary.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/buneary.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buneary.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bunnelby.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bunnelby.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bunnelby.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bunnelby.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bunnelby.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bunnelby.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/bunnelby.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/bunnelby.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/burmy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/burmy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/burmy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/burmy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/burmy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/butterfree.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/butterfree.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/buzzwole.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/buzzwole.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/buzzwole.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/buzzwole.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/buzzwole.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacnea.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacnea.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacnea.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacnea.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacnea.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacnea.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacnea.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacnea.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cacturne_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cacturne_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-ice.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-ice.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-ice.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-ice.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-ice.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-ice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-ice.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-ice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-shadow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-shadow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-shadow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-shadow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-shadow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-shadow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex-shadow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex-shadow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/calyrex.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/calyrex.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/camerupt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/camerupt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/carbink.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carbink.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/carbink.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carbink.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/carbink.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carbink.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/carbink.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carbink.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/carkol.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carkol.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/carkol.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carkol.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/carkol.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carkol.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/carkol.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carkol.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/carnivine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carnivine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/carnivine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carnivine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/carnivine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carnivine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/carnivine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carnivine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/carracosta.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carracosta.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/carracosta.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carracosta.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/carracosta.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carracosta.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/carracosta.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carracosta.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/carvanha.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carvanha.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/carvanha.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carvanha.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/carvanha.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carvanha.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/carvanha.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/carvanha.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cascoon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cascoon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cascoon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cascoon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cascoon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cascoon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cascoon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cascoon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-rainy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-rainy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-rainy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-rainy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-rainy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-rainy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-rainy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-rainy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-snowy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-snowy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-snowy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-snowy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-snowy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-snowy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-snowy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-snowy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-sunny.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-sunny.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-sunny.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-sunny.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-sunny.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-sunny.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform-sunny.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform-sunny.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/castform.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/castform.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/caterpie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/caterpie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/caterpie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/caterpie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/caterpie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/caterpie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/caterpie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/caterpie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/celebi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celebi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/celebi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celebi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/celebi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celebi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/celebi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celebi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/celesteela.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celesteela.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/celesteela.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celesteela.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/celesteela.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celesteela.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/celesteela.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/celesteela.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/centiskorch.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/centiskorch.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/chandelure.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chandelure.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/chandelure.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chandelure.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/chandelure.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chandelure.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/chandelure.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chandelure.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/chansey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chansey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/chansey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chansey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/chansey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chansey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/chansey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chansey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-x.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-x.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-x.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-x.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-x.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-x.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-x.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-x.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-y.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-y.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-y.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-y.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-y.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-y.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard-mega-y.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard-mega-y.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charizard.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charizard.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/charjabug.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charjabug.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/charjabug.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charjabug.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/charjabug.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charjabug.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/charjabug.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charjabug.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmander.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmander.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmander.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmander.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmander.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmander.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmander.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmander.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmeleon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmeleon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmeleon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmeleon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmeleon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmeleon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/charmeleon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/charmeleon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chatot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chatot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chatot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chatot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chatot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chatot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chatot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chatot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-overcast.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-overcast.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-overcast.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-overcast.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-overcast.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-overcast.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-overcast.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-overcast.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-sunshine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-sunshine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-sunshine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-sunshine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-sunshine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-sunshine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherrim-sunshine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherrim-sunshine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherubi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherubi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherubi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherubi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherubi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherubi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cherubi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cherubi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chesnaught.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chesnaught.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chesnaught.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chesnaught.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chesnaught.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chesnaught.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chesnaught.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chesnaught.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chespin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chespin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chespin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chespin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chespin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chespin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/chespin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chespin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/chewtle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chewtle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/chewtle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chewtle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/chewtle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chewtle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/chewtle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chewtle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chikorita.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chikorita.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chikorita.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chikorita.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chikorita.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chikorita.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chikorita.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chikorita.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chimchar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimchar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chimchar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimchar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chimchar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimchar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/chimchar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimchar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chimecho.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimecho.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chimecho.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimecho.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chimecho.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimecho.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chimecho.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chimecho.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chinchou.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chinchou.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chinchou.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chinchou.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chinchou.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chinchou.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/chinchou.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chinchou.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chingling.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chingling.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chingling.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chingling.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chingling.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chingling.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/chingling.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/chingling.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cinccino.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinccino.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cinccino.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinccino.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cinccino.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinccino.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cinccino.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinccino.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cinderace.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cinderace.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/clamperl.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clamperl.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/clamperl.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clamperl.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/clamperl.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clamperl.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/clamperl.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clamperl.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clauncher.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clauncher.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clauncher.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clauncher.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clauncher.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clauncher.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clauncher.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clauncher.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clawitzer.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clawitzer.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clawitzer.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clawitzer.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clawitzer.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clawitzer.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/clawitzer.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clawitzer.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/claydol.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/claydol.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/claydol.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/claydol.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/claydol.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/claydol.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/claydol.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/claydol.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefable.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefable.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefable.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefable.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefable.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefable.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefable.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefable.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefairy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefairy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefairy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefairy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefairy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefairy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/clefairy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clefairy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cleffa.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cleffa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cleffa.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cleffa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cleffa.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cleffa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cleffa.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cleffa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/clobbopus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clobbopus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/clobbopus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clobbopus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/clobbopus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clobbopus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/clobbopus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/clobbopus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cloyster.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cloyster.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cloyster.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cloyster.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cloyster.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cloyster.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cloyster.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cloyster.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/coalossal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/coalossal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cobalion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cobalion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cobalion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cobalion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cobalion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cobalion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cobalion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cobalion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cofagrigus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cofagrigus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cofagrigus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cofagrigus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cofagrigus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cofagrigus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cofagrigus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cofagrigus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/combee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/combee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/combee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/combee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/combusken_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/combusken_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/comfey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/comfey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/comfey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/comfey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/comfey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/comfey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/comfey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/comfey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/conkeldurr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/conkeldurr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/conkeldurr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/conkeldurr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/conkeldurr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/conkeldurr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/conkeldurr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/conkeldurr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/copperajah.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/copperajah.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/corphish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corphish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/corphish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corphish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/corphish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corphish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/corphish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corphish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/corsola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corsola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corviknight.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corviknight.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corvisquire.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corvisquire.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corvisquire.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corvisquire.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corvisquire.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corvisquire.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/corvisquire.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/corvisquire.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmoem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmoem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmoem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmoem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmoem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmoem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmoem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmoem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmog.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmog.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmog.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmog.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmog.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmog.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cosmog.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cosmog.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cottonee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cottonee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cottonee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cottonee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cottonee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cottonee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cottonee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cottonee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabominable.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabominable.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabominable.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabominable.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabominable.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabominable.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabominable.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabominable.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabrawler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabrawler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabrawler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabrawler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabrawler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabrawler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/crabrawler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crabrawler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cradily.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cradily.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cradily.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cradily.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cradily.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cradily.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/cradily.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cradily.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gorging.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gorging.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gorging.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gorging.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gorging.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gorging.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gorging.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gorging.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gulping.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gulping.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gulping.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gulping.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gulping.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gulping.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant-gulping.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant-gulping.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cramorant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cramorant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cranidos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cranidos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cranidos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cranidos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cranidos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cranidos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cranidos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cranidos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/crawdaunt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crawdaunt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/crawdaunt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crawdaunt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/crawdaunt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crawdaunt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/crawdaunt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crawdaunt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cresselia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cresselia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cresselia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cresselia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cresselia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cresselia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/cresselia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cresselia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/croagunk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croagunk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/croagunk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croagunk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/croagunk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croagunk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/croagunk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croagunk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/crobat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crobat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/crobat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crobat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/crobat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crobat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/crobat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crobat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/croconaw.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croconaw.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/croconaw.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croconaw.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/croconaw.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croconaw.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/croconaw.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/croconaw.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/crustle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crustle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/crustle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crustle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/crustle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crustle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/crustle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/crustle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cryogonal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cryogonal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cryogonal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cryogonal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cryogonal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cryogonal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cryogonal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cryogonal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cubchoo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubchoo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cubchoo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubchoo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cubchoo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubchoo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/cubchoo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubchoo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cubone.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubone.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cubone.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubone.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cubone.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubone.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/cubone.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cubone.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cufant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cufant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cufant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cufant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cufant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cufant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/cufant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cufant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cursola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cursola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cursola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cursola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cursola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cursola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cursola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cursola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cutiefly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cutiefly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cutiefly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cutiefly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cutiefly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cutiefly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/cutiefly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cutiefly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cyndaquil.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cyndaquil.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cyndaquil.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cyndaquil.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cyndaquil.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cyndaquil.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/cyndaquil.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/cyndaquil.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/darkrai.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darkrai.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/darkrai.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darkrai.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/darkrai.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darkrai.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/darkrai.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darkrai.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-standard.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-standard.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-standard.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-standard.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_zen_galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-zen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_zen_galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-zen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_zen_galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-zen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan_zen_galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-galar-zen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-standard.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-standard.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-standard.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-standard.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan-zen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-zen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan-zen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-zen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan-zen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-zen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darmanitan-zen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darmanitan-zen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dartrix.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dartrix.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dartrix.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dartrix.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dartrix.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dartrix.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dartrix.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dartrix.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/darumaka.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/darumaka.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/decidueye.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/decidueye.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dedenne.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dedenne.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dedenne.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dedenne.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dedenne.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dedenne.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dedenne.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dedenne.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_au.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_au.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_au.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_au.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_au.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_au.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_au.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_au.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_sp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_sp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_sp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_sp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_sp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_sp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_sp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_sp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_su.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_su.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_su.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_su.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_su.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_su.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_su.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_su.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_wi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_wi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_wi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_wi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_wi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_wi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deerling_wi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deerling_wi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deino.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deino.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deino.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deino.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deino.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deino.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/deino.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deino.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/delcatty.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delcatty.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/delcatty.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delcatty.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/delcatty.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delcatty.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/delcatty.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delcatty.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/delibird.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delibird.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/delibird.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delibird.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/delibird.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delibird.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/delibird.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delibird.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/delphox.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delphox.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/delphox.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delphox.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/delphox.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delphox.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/delphox.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/delphox.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-attack.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-attack.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-attack.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-attack.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-attack.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-attack.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-attack.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-attack.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-defense.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-defense.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-defense.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-defense.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-defense.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-defense.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-defense.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-defense.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-normal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-normal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-normal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-normal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-speed.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-speed.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-speed.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-speed.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-speed.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-speed.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/deoxys-speed.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/deoxys-speed.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dewgong.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewgong.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dewgong.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewgong.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dewgong.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewgong.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dewgong.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewgong.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dewott.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewott.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dewott.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewott.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dewott.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewott.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dewott.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewott.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dewpider.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewpider.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dewpider.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewpider.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dewpider.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewpider.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dewpider.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dewpider.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dhelmise.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dhelmise.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dhelmise.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dhelmise.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dhelmise.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dhelmise.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/dhelmise.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dhelmise.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga-origin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga-origin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga-origin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga-origin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga-origin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga-origin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga-origin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga-origin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/dialga.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dialga.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diancie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diancie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diggersby.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diggersby.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diggersby.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diggersby.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diggersby.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diggersby.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/diggersby.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diggersby.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/diglett.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/diglett.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ditto.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ditto.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ditto.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ditto.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ditto.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ditto.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ditto.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ditto.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dodrio.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dodrio.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dodrio.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dodrio.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dodrio.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dodrio.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dodrio.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dodrio.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/doduo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doduo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/doduo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doduo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/doduo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doduo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/doduo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doduo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/donphan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/donphan.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/donphan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/donphan.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/donphan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/donphan.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/donphan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/donphan.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dottler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dottler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dottler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dottler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dottler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dottler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dottler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dottler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/doublade.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doublade.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/doublade.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doublade.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/doublade.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doublade.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/doublade.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/doublade.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracovish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracovish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracovish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracovish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracovish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracovish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracovish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracovish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracozolt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracozolt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracozolt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracozolt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracozolt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracozolt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dracozolt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dracozolt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dragalge.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragalge.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dragalge.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragalge.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dragalge.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragalge.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/dragalge.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragalge.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dragapult.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragapult.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dragapult.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragapult.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dragapult.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragapult.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dragapult.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragapult.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonair.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonair.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonair.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonair.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonair.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonair.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonair.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonair.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dragonite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dragonite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drakloak.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drakloak.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drakloak.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drakloak.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drakloak.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drakloak.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drakloak.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drakloak.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/drampa.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drampa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/drampa.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drampa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/drampa.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drampa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/drampa.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drampa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drapion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drapion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drapion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drapion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drapion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drapion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drapion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drapion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dratini.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dratini.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dratini.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dratini.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dratini.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dratini.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dratini.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dratini.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drednaw.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drednaw.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dreepy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dreepy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dreepy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dreepy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dreepy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dreepy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dreepy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dreepy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifblim.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifblim.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifblim.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifblim.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifblim.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifblim.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifblim.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifblim.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifloon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifloon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifloon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifloon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifloon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifloon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/drifloon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drifloon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/drilbur.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drilbur.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/drilbur.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drilbur.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/drilbur.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drilbur.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/drilbur.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drilbur.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drizzile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drizzile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drizzile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drizzile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drizzile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drizzile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/drizzile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drizzile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/drowzee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drowzee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/drowzee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drowzee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/drowzee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drowzee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/drowzee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/drowzee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/druddigon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/druddigon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/druddigon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/druddigon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/druddigon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/druddigon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/druddigon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/druddigon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dubwool.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dubwool.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dubwool.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dubwool.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dubwool.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dubwool.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/dubwool.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dubwool.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ducklett.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ducklett.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ducklett.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ducklett.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ducklett.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ducklett.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ducklett.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ducklett.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/dugtrio.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dugtrio.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/dunsparce.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dunsparce.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/dunsparce.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dunsparce.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/dunsparce.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dunsparce.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/dunsparce.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dunsparce.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/duosion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duosion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/duosion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duosion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/duosion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duosion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/duosion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duosion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/duraludon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duraludon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/durant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/durant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/durant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/durant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/durant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/durant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/durant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/durant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusclops.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusclops.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusclops.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusclops.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusclops.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusclops.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusclops.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusclops.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusknoir.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusknoir.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusknoir.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusknoir.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusknoir.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusknoir.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dusknoir.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dusknoir.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/duskull.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duskull.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/duskull.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duskull.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/duskull.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duskull.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/duskull.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/duskull.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dustox.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dustox.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dustox.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dustox.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dustox.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dustox.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/dustox.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dustox.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dwebble.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dwebble.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dwebble.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dwebble.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dwebble.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dwebble.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/dwebble.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/dwebble.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektrik.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektrik.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektrik.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektrik.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektrik.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektrik.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektrik.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektrik.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektross.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektross.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektross.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektross.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektross.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektross.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/eelektross.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eelektross.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/eevee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eevee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-ice.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-ice.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-ice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-ice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue-noice.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-noice.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue-noice.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-noice.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue-noice.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-noice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eiscue-noice.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eiscue-noice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ekans.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ekans.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ekans.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ekans.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ekans.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ekans.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ekans.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ekans.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eldegoss.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eldegoss.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eldegoss.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eldegoss.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eldegoss.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eldegoss.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eldegoss.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eldegoss.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electabuzz.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electabuzz.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electabuzz.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electabuzz.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electabuzz.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electabuzz.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electabuzz.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electabuzz.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electivire.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electivire.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electivire.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electivire.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electivire.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electivire.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electivire.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electivire.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/electrike.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrike.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/electrike.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrike.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/electrike.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrike.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/electrike.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrike.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/electrode.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/electrode.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/elekid.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elekid.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/elekid.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elekid.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/elekid.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elekid.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/elekid.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elekid.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/elgyem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elgyem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/elgyem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elgyem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/elgyem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elgyem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/elgyem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/elgyem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emboar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emboar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emboar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emboar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emboar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emboar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emboar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emboar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emolga.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emolga.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emolga.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emolga.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emolga.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emolga.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/emolga.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/emolga.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/empoleon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/empoleon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/empoleon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/empoleon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/empoleon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/empoleon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/empoleon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/empoleon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/enamorus-incarnate.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/enamorus-incarnate.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/enamorus-incarnate.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/enamorus-incarnate.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/enamorus-incarnate.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/enamorus-incarnate.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/enamorus-incarnate.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/enamorus-incarnate.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/entei.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/entei.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/entei.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/entei.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/entei.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/entei.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/entei.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/entei.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/escavalier.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/escavalier.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/escavalier.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/escavalier.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/escavalier.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/escavalier.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/escavalier.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/escavalier.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/espeon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espeon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/espeon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espeon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/espeon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espeon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/espeon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espeon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/espurr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espurr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/espurr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espurr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/espurr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espurr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/espurr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/espurr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus_gigantamax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus-eternamax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus_gigantamax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus-eternamax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus_gigantamax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus-eternamax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus_gigantamax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus-eternamax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/eternatus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/eternatus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/excadrill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/excadrill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/excadrill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/excadrill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/excadrill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/excadrill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/excadrill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/excadrill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggcute.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggcute.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggcute.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggcute.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggcute.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggcute.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggcute.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggcute.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/exeggutor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exeggutor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/exploud.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exploud.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/exploud.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exploud.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/exploud.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exploud.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/exploud.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/exploud.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/falinks.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/falinks.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/falinks.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/falinks.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/falinks.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/falinks.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/falinks.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/falinks.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/farfetchd.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/farfetchd.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/fearow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fearow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/fearow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fearow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/fearow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fearow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/fearow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fearow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/feebas.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feebas.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/feebas.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feebas.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/feebas.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feebas.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/feebas.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feebas.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fennekin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fennekin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fennekin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fennekin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fennekin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fennekin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fennekin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fennekin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/feraligatr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feraligatr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/feraligatr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feraligatr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/feraligatr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feraligatr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/feraligatr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/feraligatr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferroseed.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferroseed.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferroseed.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferroseed.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferroseed.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferroseed.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferroseed.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferroseed.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferrothorn.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferrothorn.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferrothorn.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferrothorn.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferrothorn.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferrothorn.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/ferrothorn.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ferrothorn.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/finneon_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/finneon_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/flaaffy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flaaffy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/flaaffy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flaaffy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/flaaffy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flaaffy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/flaaffy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flaaffy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/flabebe.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flabebe.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/flabebe.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flabebe.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/flabebe.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flabebe.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/flabebe.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flabebe.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/flapple.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flapple.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/flareon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flareon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/flareon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flareon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/flareon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flareon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/flareon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flareon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchinder.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchinder.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchinder.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchinder.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchinder.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchinder.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchinder.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchinder.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchling.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchling.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchling.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchling.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchling.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchling.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/fletchling.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fletchling.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/floatzel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floatzel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/floatzel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floatzel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/floatzel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floatzel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/floatzel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floatzel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette-eternal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette-eternal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette-eternal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette-eternal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette-eternal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette-eternal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette-eternal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette-eternal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/floette.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/floette.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/florges.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/florges.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/florges.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/florges.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/florges.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/florges.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/florges.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/florges.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/flygon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flygon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/flygon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flygon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/flygon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flygon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/flygon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/flygon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/fomantis.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fomantis.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/fomantis.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fomantis.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/fomantis.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fomantis.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/fomantis.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fomantis.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/foongus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/foongus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/foongus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/foongus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/foongus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/foongus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/foongus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/foongus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/forretress.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/forretress.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/forretress.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/forretress.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/forretress.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/forretress.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/forretress.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/forretress.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/fraxure.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fraxure.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/fraxure.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fraxure.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/fraxure.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fraxure.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/fraxure.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/fraxure.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/frillish_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frillish_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/froakie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froakie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/froakie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froakie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/froakie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froakie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/froakie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froakie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/frogadier.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frogadier.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/frogadier.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frogadier.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/frogadier.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frogadier.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/frogadier.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frogadier.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/froslass.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froslass.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/froslass.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froslass.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/froslass.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froslass.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/froslass.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/froslass.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/frosmoth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frosmoth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/frosmoth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frosmoth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/frosmoth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frosmoth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/frosmoth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/frosmoth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/furfrou.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furfrou.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/furfrou.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furfrou.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/furfrou.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furfrou.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/furfrou.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furfrou.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/furret.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furret.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/furret.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furret.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/furret.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furret.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/furret.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/furret.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gabite_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gabite_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gallade.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gallade.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/galvantula.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/galvantula.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/galvantula.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/galvantula.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/galvantula.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/galvantula.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/galvantula.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/galvantula.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/garbodor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garbodor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/garchomp_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/garchomp_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gardevoir.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gardevoir.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gastly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gastly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gastly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gastly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_east.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_east.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_east.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_east.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_east.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_east.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_east.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_east.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_west.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_west.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_west.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_west.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_west.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_west.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gastrodon_west.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gastrodon_west.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/genesect.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/genesect.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/genesect.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/genesect.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/genesect.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gengar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gengar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/geodude.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/geodude.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/gible_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gible_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gigalith.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gigalith.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gigalith.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gigalith.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gigalith.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gigalith.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gigalith.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gigalith.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/girafarig_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/girafarig_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-altered.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-altered.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-altered.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-altered.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina-origin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-origin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina-origin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-origin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina-origin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-origin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/giratina-origin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/giratina-origin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/glaceon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glaceon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/glaceon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glaceon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/glaceon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glaceon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/glaceon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glaceon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/glalie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glalie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/glameow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glameow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/glameow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glameow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/glameow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glameow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/glameow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glameow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/glastrier.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glastrier.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/glastrier.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glastrier.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/glastrier.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glastrier.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/glastrier.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/glastrier.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gligar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gligar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gligar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gligar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gligar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gligar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gligar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gligar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gliscor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gliscor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gliscor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gliscor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gliscor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gliscor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/gliscor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gliscor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gloom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gloom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gloom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gloom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gloom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gloom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gloom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gloom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gogoat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gogoat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gogoat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gogoat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gogoat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gogoat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gogoat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gogoat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golbat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golbat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golbat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golbat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golbat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golbat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golbat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golbat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/goldeen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goldeen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/goldeen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goldeen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/goldeen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goldeen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/goldeen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goldeen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golduck.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golduck.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golduck.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golduck.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golduck.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golduck.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golduck.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golduck.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/golem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golett.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golett.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golett.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golett.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golett.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golett.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golett.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golett.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/golisopod.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golisopod.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/golisopod.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golisopod.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/golisopod.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golisopod.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/golisopod.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golisopod.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golurk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golurk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golurk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golurk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golurk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golurk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/golurk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/golurk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goodra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goodra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goomy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goomy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goomy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goomy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goomy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goomy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/goomy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/goomy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gorebyss.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gorebyss.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gorebyss.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gorebyss.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gorebyss.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gorebyss.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gorebyss.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gorebyss.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/gossifleur.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gossifleur.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/gossifleur.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gossifleur.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/gossifleur.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gossifleur.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/gossifleur.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gossifleur.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothita.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothita.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothita.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothita.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothita.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothita.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothita.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothita.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothitelle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothitelle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothitelle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothitelle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothitelle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothitelle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothitelle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothitelle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothorita.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothorita.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothorita.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothorita.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothorita.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothorita.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gothorita.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gothorita.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-average.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-average.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-average.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-average.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-large.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-large.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-large.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-large.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-small.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-small.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-small.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-small.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-super.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-super.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/gourgeist-super.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gourgeist-super.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/granbull.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/granbull.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/granbull.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/granbull.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/granbull.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/granbull.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/granbull.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/granbull.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grapploct.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grapploct.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grapploct.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grapploct.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grapploct.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grapploct.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grapploct.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grapploct.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/graveler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/graveler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/greedent.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greedent.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/greedent.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greedent.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/greedent.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greedent.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/greedent.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greedent.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja-ash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja-ash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja-ash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja-ash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja-ash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja-ash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja-ash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja-ash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/greninja.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/greninja.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/grimer.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimer.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grimmsnarl.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grimmsnarl.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grookey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grookey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grookey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grookey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grookey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grookey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/grookey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grookey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/grotle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grotle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/grotle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grotle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/grotle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grotle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/grotle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grotle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon-primal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon-primal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon-primal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon-primal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon-primal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon-primal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon-primal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon-primal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/groudon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/groudon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grovyle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grovyle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grovyle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grovyle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grovyle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grovyle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grovyle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grovyle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/growlithe.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/growlithe.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/grubbin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grubbin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/grubbin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grubbin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/grubbin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grubbin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/grubbin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grubbin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grumpig.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grumpig.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grumpig.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grumpig.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grumpig.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grumpig.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/grumpig.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/grumpig.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gulpin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gulpin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gulpin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gulpin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gulpin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gulpin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/gulpin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gulpin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/gumshoos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gumshoos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/gumshoos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gumshoos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/gumshoos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gumshoos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/gumshoos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gumshoos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gurdurr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gurdurr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gurdurr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gurdurr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gurdurr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gurdurr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/gurdurr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gurdurr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/guzzlord.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/guzzlord.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/guzzlord.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/guzzlord.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/guzzlord.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/guzzlord.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/guzzlord.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/guzzlord.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/gyarados.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/gyarados.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/hakamo-o.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hakamo-o.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/hakamo-o.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hakamo-o.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/hakamo-o.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hakamo-o.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/hakamo-o.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hakamo-o.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/happiny.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/happiny.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/happiny.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/happiny.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/happiny.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/happiny.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/happiny.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/happiny.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/hariyama.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hariyama.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/hariyama.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hariyama.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/hariyama.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hariyama.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/hariyama.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hariyama.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatenna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatenna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatenna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatenna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatenna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatenna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatenna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatenna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hatterene.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hatterene.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hattrem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hattrem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hattrem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hattrem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hattrem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hattrem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/hattrem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hattrem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/haunter.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haunter.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/haunter.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haunter.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/haunter.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haunter.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/haunter.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haunter.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hawlucha.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hawlucha.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hawlucha.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hawlucha.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hawlucha.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hawlucha.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hawlucha.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hawlucha.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/haxorus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haxorus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/haxorus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haxorus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/haxorus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haxorus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/haxorus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/haxorus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/heatmor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatmor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/heatmor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatmor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/heatmor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatmor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/heatmor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatmor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/heatran.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatran.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/heatran.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatran.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/heatran.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatran.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/heatran.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heatran.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/heliolisk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heliolisk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/heliolisk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heliolisk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/heliolisk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heliolisk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/heliolisk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heliolisk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/helioptile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/helioptile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/helioptile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/helioptile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/helioptile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/helioptile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/helioptile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/helioptile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/heracross_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/heracross_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/herdier.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/herdier.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/herdier.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/herdier.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/herdier.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/herdier.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/herdier.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/herdier.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippopotas.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippopotas.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippopotas.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippopotas.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippopotas.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippopotas.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippopotas.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippopotas.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippowdon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippowdon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippowdon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippowdon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippowdon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippowdon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/hippowdon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hippowdon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonchan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonchan.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonchan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonchan.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonchan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonchan.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonchan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonchan.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonlee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonlee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonlee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonlee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonlee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonlee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmonlee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmonlee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmontop.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmontop.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmontop.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmontop.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmontop.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmontop.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hitmontop.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hitmontop.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ho-oh.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ho-oh.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ho-oh.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ho-oh.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ho-oh.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ho-oh.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ho-oh.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ho-oh.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/honchkrow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honchkrow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/honchkrow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honchkrow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/honchkrow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honchkrow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/honchkrow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honchkrow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/honedge.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honedge.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/honedge.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honedge.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/honedge.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honedge.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/honedge.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/honedge.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa-unbound.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa-unbound.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa-unbound.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa-unbound.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa-unbound.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa-unbound.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa-unbound.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa-unbound.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa_confined.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa_confined.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa_confined.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/hoopa_confined.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoopa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoothoot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoothoot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoothoot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoothoot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoothoot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoothoot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoothoot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoothoot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoppip.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoppip.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoppip.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoppip.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoppip.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoppip.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/hoppip.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hoppip.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/horsea.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/horsea.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/horsea.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/horsea.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/horsea.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/horsea.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/horsea.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/horsea.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndoom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndoom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndour.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndour.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndour.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndour.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndour.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndour.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/houndour.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/houndour.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/huntail.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/huntail.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/huntail.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/huntail.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/huntail.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/huntail.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/huntail.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/huntail.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/hydreigon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hydreigon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/hydreigon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hydreigon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/hydreigon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hydreigon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/hydreigon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hydreigon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hypno.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hypno.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hypno.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hypno.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hypno.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hypno.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/hypno.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/hypno.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/igglybuff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/igglybuff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/igglybuff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/igglybuff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/igglybuff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/igglybuff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/igglybuff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/igglybuff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/illumise.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/illumise.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/illumise.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/illumise.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/illumise.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/illumise.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/illumise.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/illumise.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/impidimp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/impidimp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/impidimp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/impidimp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/impidimp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/impidimp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/impidimp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/impidimp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/incineroar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/incineroar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/incineroar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/incineroar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/incineroar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/incineroar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/incineroar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/incineroar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee-female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee-female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee-female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee-female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/indeedee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/indeedee-male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/infernape.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/infernape.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/infernape.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/infernape.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/infernape.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/infernape.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/infernape.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/infernape.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/inkay.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inkay.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/inkay.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inkay.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/inkay.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inkay.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/inkay.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inkay.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/inteleon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/inteleon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ivysaur.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ivysaur.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ivysaur.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ivysaur.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ivysaur.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ivysaur.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ivysaur.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ivysaur.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/jangmo-o.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jangmo-o.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/jangmo-o.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jangmo-o.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/jangmo-o.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jangmo-o.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/jangmo-o.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jangmo-o.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/jellicent_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jellicent_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jigglypuff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jigglypuff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jigglypuff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jigglypuff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jigglypuff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jigglypuff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jigglypuff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jigglypuff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/jirachi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jirachi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/jirachi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jirachi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/jirachi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jirachi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/jirachi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jirachi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jolteon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jolteon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jolteon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jolteon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jolteon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jolteon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jolteon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jolteon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/joltik.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/joltik.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/joltik.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/joltik.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/joltik.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/joltik.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/joltik.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/joltik.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/jumpluff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jumpluff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/jumpluff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jumpluff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/jumpluff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jumpluff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/jumpluff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jumpluff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jynx.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jynx.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jynx.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jynx.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jynx.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jynx.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/jynx.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/jynx.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabuto.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabuto.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabuto.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabuto.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabuto.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabuto.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabuto.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabuto.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabutops.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabutops.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabutops.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabutops.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabutops.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabutops.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kabutops.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kabutops.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kadabra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kadabra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kadabra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kadabra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kadabra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kadabra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kadabra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kadabra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kakuna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kakuna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kakuna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kakuna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kakuna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kakuna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kakuna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kakuna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kangaskhan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kangaskhan.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/karrablast.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/karrablast.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/karrablast.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/karrablast.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/karrablast.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/karrablast.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/karrablast.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/karrablast.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kartana.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kartana.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kartana.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kartana.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kartana.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kartana.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kartana.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kartana.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kecleon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kecleon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kecleon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kecleon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kecleon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kecleon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kecleon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kecleon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-ordinary.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-ordinary.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-ordinary.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-ordinary.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo-resolute.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-resolute.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo-resolute.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-resolute.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo-resolute.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-resolute.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/keldeo-resolute.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/keldeo-resolute.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingdra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingdra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingdra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingdra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingdra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingdra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingdra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingdra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kingler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kingler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kirlia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kirlia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kirlia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kirlia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kirlia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kirlia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kirlia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kirlia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klang.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klang.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klang.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klang.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klang.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klang.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klang.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klang.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kleavor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kleavor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kleavor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kleavor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kleavor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kleavor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/kleavor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kleavor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/klefki.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klefki.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/klefki.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klefki.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/klefki.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klefki.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/klefki.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klefki.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klink.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klink.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klink.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klink.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klink.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klink.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klink.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klink.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klinklang.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klinklang.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klinklang.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klinklang.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klinklang.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klinklang.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/klinklang.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/klinklang.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/koffing.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koffing.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/koffing.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koffing.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/koffing.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koffing.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/koffing.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/koffing.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/komala.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/komala.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/komala.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/komala.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/komala.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/komala.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/komala.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/komala.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kommo-o.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kommo-o.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kommo-o.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kommo-o.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kommo-o.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kommo-o.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/kommo-o.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kommo-o.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/krabby.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krabby.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/krabby.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krabby.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/krabby.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krabby.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/krabby.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krabby.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/kricketune_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kricketune_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krokorok.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krokorok.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krokorok.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krokorok.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krokorok.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krokorok.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krokorok.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krokorok.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krookodile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krookodile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krookodile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krookodile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krookodile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krookodile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/krookodile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/krookodile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/kubfu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kubfu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/kubfu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kubfu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/kubfu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kubfu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/kubfu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kubfu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre-primal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre-primal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre-primal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre-primal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre-primal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre-primal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre-primal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre-primal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/kyogre.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyogre.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-black.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-black.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-black.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-black.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-black.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-black.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-black.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-black.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-white.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-white.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-white.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-white.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-white.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-white.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem-white.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem-white.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/kyurem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/kyurem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lairon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lairon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lairon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lairon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lairon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lairon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lairon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lairon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lampent.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lampent.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lampent.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lampent.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lampent.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lampent.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lampent.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lampent.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-incarnate.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-incarnate.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-incarnate.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-incarnate.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-incarnate.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-incarnate.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-incarnate.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-incarnate.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-therian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-therian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-therian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-therian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-therian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-therian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/landorus-therian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/landorus-therian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lanturn.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lanturn.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lanturn.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lanturn.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lanturn.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lanturn.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lanturn.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lanturn.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lapras.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lapras.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/larvesta.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvesta.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/larvesta.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvesta.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/larvesta.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvesta.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/larvesta.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvesta.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/larvitar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvitar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/larvitar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvitar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/larvitar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvitar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/larvitar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/larvitar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latias.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latias.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/latios.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/latios.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/leafeon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leafeon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/leafeon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leafeon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/leafeon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leafeon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/leafeon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leafeon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/leavanny.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leavanny.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/leavanny.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leavanny.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/leavanny.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leavanny.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/leavanny.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/leavanny.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledyba.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledyba.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledyba.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledyba.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledyba.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledyba.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ledyba.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ledyba.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickilicky.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickilicky.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickilicky.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickilicky.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickilicky.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickilicky.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickilicky.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickilicky.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickitung.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickitung.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickitung.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickitung.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickitung.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickitung.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/lickitung.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lickitung.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/liepard.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/liepard.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/liepard.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/liepard.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/liepard.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/liepard.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/liepard.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/liepard.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lileep.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lileep.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lileep.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lileep.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lileep.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lileep.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lileep.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lileep.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lilligant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lilligant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lillipup.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lillipup.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lillipup.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lillipup.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lillipup.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lillipup.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/lillipup.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lillipup.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/linoone.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/linoone.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/litleo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litleo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/litleo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litleo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/litleo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litleo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/litleo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litleo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/litten.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litten.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/litten.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litten.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/litten.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litten.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/litten.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litten.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/litwick.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litwick.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/litwick.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litwick.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/litwick.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litwick.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/litwick.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/litwick.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lombre.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lombre.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lombre.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lombre.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lombre.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lombre.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lombre.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lombre.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lopunny.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lopunny.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lotad.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lotad.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lotad.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lotad.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lotad.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lotad.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lotad.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lotad.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/loudred.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/loudred.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/loudred.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/loudred.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/loudred.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/loudred.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/loudred.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/loudred.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lucario.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lucario.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ludicolo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ludicolo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ludicolo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ludicolo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ludicolo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ludicolo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ludicolo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ludicolo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lugia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lugia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lugia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lugia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lugia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lugia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/lugia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lugia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/lumineon_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lumineon_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunala.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunala.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunala.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunala.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lunatone.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunatone.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lunatone.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunatone.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lunatone.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunatone.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/lunatone.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lunatone.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lurantis.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lurantis.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lurantis.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lurantis.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lurantis.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lurantis.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lurantis.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lurantis.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/luvdisc.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luvdisc.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/luvdisc.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luvdisc.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/luvdisc.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luvdisc.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/luvdisc.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luvdisc.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxio.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxio.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxio.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxio.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxio.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxio.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxio.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxio.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/luxray_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/luxray_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-dusk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-dusk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-dusk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-dusk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-dusk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-dusk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-dusk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-dusk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midday.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midday.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midday.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midday.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-midnight.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midnight.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-midnight.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midnight.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-midnight.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midnight.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lycanroc-midnight.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/lycanroc-midnight.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machamp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machamp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machoke.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machoke.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machoke.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machoke.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machoke.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machoke.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machoke.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machoke.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machop.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machop.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machop.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machop.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machop.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machop.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/machop.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/machop.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magby.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magby.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magby.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magby.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magby.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magby.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magby.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magby.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/magcargo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magcargo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/magcargo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magcargo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/magcargo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magcargo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/magcargo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magcargo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/magearna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magearna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/magearna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magearna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/magearna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magearna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/magearna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magearna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magikarp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magikarp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magikarp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magikarp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magikarp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magikarp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magikarp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magikarp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmortar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmortar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmortar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmortar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmortar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmortar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magmortar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magmortar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnemite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnemite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnemite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnemite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnemite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnemite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnemite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnemite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magneton.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magneton.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magneton.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magneton.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magneton.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magneton.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magneton.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magneton.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnezone.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnezone.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnezone.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnezone.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnezone.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnezone.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/magnezone.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/magnezone.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/makuhita.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/makuhita.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/makuhita.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/makuhita.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/makuhita.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/makuhita.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/makuhita.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/makuhita.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/malamar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/malamar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/malamar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/malamar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/malamar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/malamar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/malamar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/malamar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mamoswine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mamoswine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mamoswine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mamoswine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mamoswine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mamoswine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mamoswine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mamoswine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/manaphy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manaphy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/manaphy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manaphy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/manaphy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manaphy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/manaphy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manaphy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mandibuzz.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mandibuzz.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mandibuzz.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mandibuzz.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mandibuzz.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mandibuzz.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mandibuzz.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mandibuzz.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/manectric.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/manectric.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mankey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mankey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mankey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mankey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mankey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mankey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mankey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mankey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantyke.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantyke.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantyke.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantyke.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantyke.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantyke.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mantyke.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mantyke.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/maractus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/maractus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/maractus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/maractus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/maractus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/maractus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/maractus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/maractus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mareanie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareanie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mareanie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareanie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mareanie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareanie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mareanie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareanie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mareep.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareep.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mareep.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareep.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mareep.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareep.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mareep.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mareep.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/marill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/marill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/marill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/marill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/marowak.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marowak.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/marshadow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshadow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/marshadow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshadow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/marshadow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshadow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/marshadow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshadow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/marshtomp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshtomp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/marshtomp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshtomp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/marshtomp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshtomp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/marshtomp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/marshtomp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/masquerain.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/masquerain.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/masquerain.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/masquerain.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/masquerain.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/masquerain.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/masquerain.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/masquerain.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mawile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mawile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/medicham.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/medicham.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/meditite_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meditite_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/meganium_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meganium_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/melmetal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/melmetal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-aria.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-aria.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-aria.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-aria.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-aria.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-aria.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-aria.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-aria.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-pirouette.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-pirouette.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-pirouette.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-pirouette.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-pirouette.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-pirouette.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/meloetta-pirouette.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meloetta-pirouette.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/meltan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meltan.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/meltan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meltan.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/meltan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meltan.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/meltan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meltan.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_f.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_f.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_f.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_f.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_f.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_f.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_f.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_f.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_m.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_m.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_m.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_m.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_m.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_m.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/meowstic_m.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowstic_m.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/meowth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/meowth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mesprit.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mesprit.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mesprit.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mesprit.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mesprit.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mesprit.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mesprit.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mesprit.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metagross.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metagross.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metang.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metang.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metang.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metang.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metang.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metang.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/metang.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metang.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/metapod.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metapod.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/metapod.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metapod.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/metapod.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metapod.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/metapod.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/metapod.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mew.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mew.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mew.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mew.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mew.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mew.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mew.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mew.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-x.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-x.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-x.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-x.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-x.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-x.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-x.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-x.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-y.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-y.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-y.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-y.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-y.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-y.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo-mega-y.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo-mega-y.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mewtwo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mewtwo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienfoo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienfoo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienfoo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienfoo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienfoo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienfoo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienfoo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienfoo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienshao.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienshao.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienshao.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienshao.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienshao.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienshao.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/mienshao.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mienshao.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mightyena.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mightyena.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mightyena.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mightyena.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mightyena.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mightyena.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mightyena.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mightyena.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/milcery.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milcery.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/milcery.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milcery.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/milcery.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milcery.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/milcery.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milcery.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/milotic_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/milotic_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/miltank.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miltank.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/miltank.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miltank.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/miltank.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miltank.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/miltank.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/miltank.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mime-jr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mime-jr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mime-jr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mime-jr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mime-jr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mime-jr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mime-jr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mime-jr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mimikyu-disguised.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mimikyu-disguised.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mimikyu-disguised.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mimikyu-disguised.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mimikyu-disguised.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mimikyu-disguised.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mimikyu-disguised.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mimikyu-disguised.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/minccino.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minccino.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/minccino.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minccino.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/minccino.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minccino.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/minccino.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minccino.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/minior.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minior-red-meteor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/minior.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minior-red-meteor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/minior.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minior-red-meteor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/minior.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minior-red-meteor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/minun.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minun.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/minun.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minun.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/minun.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minun.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/minun.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/minun.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/misdreavus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/misdreavus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/misdreavus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/misdreavus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/misdreavus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/misdreavus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/misdreavus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/misdreavus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mismagius.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mismagius.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mismagius.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mismagius.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mismagius.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mismagius.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/mismagius.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mismagius.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/moltres.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/moltres.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/monferno.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/monferno.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/monferno.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/monferno.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/monferno.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/monferno.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/monferno.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/monferno.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/morelull.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morelull.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/morelull.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morelull.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/morelull.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morelull.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/morelull.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morelull.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morgrem.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morgrem.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morgrem.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morgrem.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morgrem.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morgrem.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morgrem.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morgrem.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-full-belly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-full-belly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-full-belly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-full-belly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-full-belly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-full-belly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-full-belly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-full-belly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-hangry.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-hangry.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-hangry.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-hangry.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-hangry.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-hangry.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/morpeko-hangry.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/morpeko-hangry.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mothim.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mothim.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mothim.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mothim.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mothim.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mothim.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/mothim.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mothim.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-mime.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-mime.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-rime.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-rime.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-rime.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-rime.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-rime.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-rime.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/mr-rime.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mr-rime.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudbray.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudbray.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudbray.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudbray.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudbray.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudbray.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudbray.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudbray.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mudkip.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudkip.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mudkip.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudkip.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mudkip.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudkip.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/mudkip.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudkip.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudsdale.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudsdale.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudsdale.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudsdale.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudsdale.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudsdale.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/mudsdale.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/mudsdale.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/muk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/muk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/munchlax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munchlax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/munchlax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munchlax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/munchlax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munchlax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/munchlax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munchlax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/munna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/munna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/munna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/munna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/munna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/murkrow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/murkrow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/murkrow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/murkrow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/murkrow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/murkrow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/murkrow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/murkrow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/musharna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/musharna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/musharna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/musharna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/musharna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/musharna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/musharna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/musharna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/naganadel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/naganadel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/naganadel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/naganadel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/naganadel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/naganadel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/naganadel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/naganadel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/natu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/natu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/natu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/natu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/natu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/natu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/natu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/natu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala_dawn.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dawn.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala_dawn.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dawn.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala_dawn.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dawn.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/lunala_dawn.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dawn.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo_dusk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dusk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo_dusk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dusk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo_dusk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dusk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo_dusk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-dusk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma-ultra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-ultra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma-ultra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-ultra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma-ultra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-ultra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma-ultra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma-ultra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/necrozma.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/necrozma.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/nickit.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nickit.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/nickit.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nickit.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/nickit.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nickit.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/nickit.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nickit.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoking.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoking.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoking.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoking.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoking.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoking.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoking.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoking.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoqueen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoqueen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoqueen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoqueen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoqueen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoqueen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoqueen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoqueen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-f.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-f.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-f.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-f.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-f.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-f.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-f.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-f.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-m.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-m.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-m.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-m.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-m.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-m.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidoran-m.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidoran-m.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorina.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorina.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorina.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorina.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorina.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorina.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorina.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorina.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorino.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorino.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorino.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorino.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorino.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorino.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/nidorino.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nidorino.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/nihilego.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nihilego.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/nihilego.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nihilego.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/nihilego.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nihilego.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/nihilego.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nihilego.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nincada.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nincada.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nincada.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nincada.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nincada.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nincada.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nincada.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nincada.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ninetales.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninetales.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ninjask.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninjask.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ninjask.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninjask.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ninjask.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninjask.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ninjask.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ninjask.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/noctowl.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noctowl.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/noctowl.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noctowl.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/noctowl.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noctowl.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/noctowl.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noctowl.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noibat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noibat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noibat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noibat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noibat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noibat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noibat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noibat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noivern.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noivern.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noivern.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noivern.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noivern.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noivern.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/noivern.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/noivern.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nosepass.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nosepass.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nosepass.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nosepass.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nosepass.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nosepass.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nosepass.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nosepass.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/numel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/numel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/numel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/numel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/numel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/numel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/numel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/numel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nuzleaf.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nuzleaf.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nuzleaf.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nuzleaf.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nuzleaf.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nuzleaf.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/nuzleaf.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/nuzleaf.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/obstagoon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/obstagoon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/obstagoon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/obstagoon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/obstagoon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/obstagoon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/obstagoon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/obstagoon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/octillery.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/octillery.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/octillery.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/octillery.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/octillery.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/octillery.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/octillery.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/octillery.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/oddish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oddish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/oddish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oddish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/oddish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oddish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/oddish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oddish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omanyte.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omanyte.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omanyte.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omanyte.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omanyte.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omanyte.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omanyte.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omanyte.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omastar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omastar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omastar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omastar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omastar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omastar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/omastar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/omastar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/onix.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/onix.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/onix.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/onix.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/onix.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/onix.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/onix.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/onix.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oranguru.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oranguru.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oranguru.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oranguru.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oranguru.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oranguru.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oranguru.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oranguru.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/orbeetle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/orbeetle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-baile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-baile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-baile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-baile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-baile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-baile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-baile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-baile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pau.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pau.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pau.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pau.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pau.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pau.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pau.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pau.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pom-pom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pom-pom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pom-pom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pom-pom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pom-pom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pom-pom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-pom-pom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-pom-pom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-sensu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-sensu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-sensu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-sensu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-sensu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-sensu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/oricorio-sensu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oricorio-sensu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/oshawott.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oshawott.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/oshawott.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oshawott.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/oshawott.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oshawott.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/oshawott.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/oshawott.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/overqwil.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/overqwil.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/overqwil.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/overqwil.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/overqwil.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/overqwil.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/overqwil.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/overqwil.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/pachirisu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pachirisu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/pachirisu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pachirisu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/pachirisu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pachirisu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/pachirisu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pachirisu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia-origin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia-origin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia-origin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia-origin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia-origin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia-origin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia-origin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia-origin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/palkia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palkia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/palossand.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palossand.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/palossand.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palossand.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/palossand.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palossand.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/palossand.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palossand.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/palpitoad.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palpitoad.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/palpitoad.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palpitoad.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/palpitoad.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palpitoad.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/palpitoad.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/palpitoad.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pancham.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pancham.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pancham.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pancham.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pancham.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pancham.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pancham.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pancham.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pangoro.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pangoro.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pangoro.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pangoro.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pangoro.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pangoro.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pangoro.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pangoro.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/panpour.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/panpour.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/panpour.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/panpour.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/panpour.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/panpour.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/panpour.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/panpour.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansage.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansage.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansage.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansage.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansage.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansage.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansage.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansage.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansear.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansear.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansear.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansear.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansear.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansear.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pansear.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pansear.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/paras.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/paras.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/paras.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/paras.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/paras.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/paras.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/paras.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/paras.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/parasect.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/parasect.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/parasect.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/parasect.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/parasect.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/parasect.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/parasect.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/parasect.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/passimian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/passimian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/passimian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/passimian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/passimian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/passimian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/passimian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/passimian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/patrat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/patrat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/patrat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/patrat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/patrat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/patrat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/patrat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/patrat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pawniard.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pawniard.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pawniard.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pawniard.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pawniard.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pawniard.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pawniard.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pawniard.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/pelipper.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pelipper.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/pelipper.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pelipper.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/pelipper.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pelipper.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/pelipper.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pelipper.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/perrserker.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/perrserker.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/perrserker.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/perrserker.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/perrserker.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/perrserker.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/perrserker.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/perrserker.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/persian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/persian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/petilil.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/petilil.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/petilil.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/petilil.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/petilil.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/petilil.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/petilil.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/petilil.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/phanpy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phanpy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/phanpy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phanpy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/phanpy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phanpy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/phanpy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phanpy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/phantump.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phantump.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/phantump.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phantump.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/phantump.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phantump.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/phantump.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phantump.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pheromosa.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pheromosa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pheromosa.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pheromosa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pheromosa.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pheromosa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pheromosa.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pheromosa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/phione.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phione.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/phione.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phione.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/phione.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phione.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/phione.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/phione.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pichu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pichu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pichu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pichu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pichu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pichu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pichu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pichu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeotto.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeotto.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeotto.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeotto.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeotto.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeotto.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgeotto.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgeotto.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pidgey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidgey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pidove.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidove.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pidove.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidove.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pidove.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidove.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pidove.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pidove.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pignite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pignite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pignite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pignite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pignite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pignite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/pignite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pignite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachuash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachuash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachuash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachuash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachuash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachuash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pikachuash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikachuash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pikipek.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikipek.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pikipek.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikipek.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pikipek.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikipek.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pikipek.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pikipek.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/piloswine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piloswine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/piloswine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piloswine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/piloswine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piloswine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/piloswine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piloswine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/pincurchin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pincurchin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/pincurchin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pincurchin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/pincurchin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pincurchin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/pincurchin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pincurchin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pineco.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pineco.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pineco.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pineco.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pineco.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pineco.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pineco.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pineco.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/pinsir.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pinsir.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/piplup.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piplup.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/piplup.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piplup.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/piplup.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piplup.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/piplup.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/piplup.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/plusle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/plusle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/plusle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/plusle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/plusle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/plusle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/plusle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/plusle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/poinseon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poinseon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/poinseon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poinseon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/poinseon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poinseon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/poinseon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poinseon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/poipole.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poipole.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/poipole.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poipole.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/poipole.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poipole.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/poipole.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poipole.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/politoed.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/politoed.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/politoed.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/politoed.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/politoed.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/politoed.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/politoed.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/politoed.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwag.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwag.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwag.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwag.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwag.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwag.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwag.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwag.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwhirl.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwhirl.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwhirl.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwhirl.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwhirl.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwhirl.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwhirl.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwhirl.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwrath.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwrath.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwrath.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwrath.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwrath.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwrath.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/poliwrath.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poliwrath.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist_fake.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist_fake.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist_fake.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist_fake.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist_nofake.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist_nofake.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/polteageist_nofake.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/polteageist_nofake.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/ponyta.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ponyta.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/poochyena.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poochyena.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/poochyena.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poochyena.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/poochyena.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poochyena.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/poochyena.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/poochyena.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/popplio.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/popplio.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/popplio.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/popplio.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/popplio.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/popplio.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/popplio.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/popplio.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon-z.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon-z.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon-z.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon-z.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon-z.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon-z.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon-z.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon-z.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon2.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon2.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon2.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon2.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon2.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon2.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/porygon2.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/porygon2.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/primarina.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primarina.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/primarina.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primarina.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/primarina.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primarina.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/primarina.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primarina.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/primeape.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primeape.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/primeape.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primeape.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/primeape.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primeape.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/primeape.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/primeape.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/prinplup.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/prinplup.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/prinplup.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/prinplup.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/prinplup.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/prinplup.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/prinplup.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/prinplup.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/probopass.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/probopass.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/probopass.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/probopass.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/probopass.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/probopass.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/probopass.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/probopass.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/psyduck.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/psyduck.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/psyduck.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/psyduck.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/psyduck.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/psyduck.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/psyduck.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/psyduck.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-average.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-average.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-average.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-average.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-large.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-large.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-large.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-large.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-small.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-small.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-small.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-small.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-super.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-super.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pumpkaboo-super.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pumpkaboo-super.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pupitar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pupitar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pupitar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pupitar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pupitar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pupitar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/pupitar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pupitar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/purrloin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purrloin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/purrloin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purrloin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/purrloin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purrloin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/purrloin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purrloin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/purugly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purugly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/purugly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purugly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/purugly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purugly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/purugly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/purugly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_f.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_f.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_f.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_f.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_f.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_f.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_f.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_f.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_m.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_m.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_m.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_m.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_m.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_m.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/pyroar_m.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyroar_m.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pyukumuku.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyukumuku.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pyukumuku.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyukumuku.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pyukumuku.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyukumuku.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/pyukumuku.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/pyukumuku.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quagsire.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quagsire.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quagsire.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quagsire.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quagsire.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quagsire.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quagsire.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quagsire.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quilava.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilava.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/quilava.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilava.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/quilava.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilava.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/quilava.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilava.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/quilladin.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilladin.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/quilladin.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilladin.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/quilladin.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilladin.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/quilladin.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/quilladin.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/qwilfish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/qwilfish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/raboot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raboot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/raboot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raboot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/raboot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raboot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/raboot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raboot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu-alola.xml
similarity index 98%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu-alola.xml
index 212c7265d9..23efc99c69 100644
--- a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu-alola.xml
+++ b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu-alola.xml
@@ -3,7 +3,7 @@
  <model>
   <phase name="global" scale="0.40"/>
   <metadata head="Head" headAxis="2" headAxis2="0" headCap="-80,80" headCap1="-50,50" headDir="-1" headDir2="1"/>
-  <customTex default="raichu_alola">
+  <customTex default="raichu-alola">
    <part name="Head" tex="raichualolahead"/>
    <animation diffs="0,0.34" part="Head" trigger="random:0.001:20"/>
    <animation diffs="0.0,0.67" part="Head" trigger="random:0.005:20"/>
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raichu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raichu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/raikou.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raikou.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/raikou.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raikou.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/raikou.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raikou.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/raikou.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raikou.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ralts.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ralts.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ralts.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ralts.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ralts.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ralts.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/ralts.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ralts.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rampardos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rampardos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rampardos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rampardos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rampardos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rampardos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rampardos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rampardos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rapidash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rapidash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/raticate.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/raticate.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rattata.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rattata.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/rayquaza.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rayquaza.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regice.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regice.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regice.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regice.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regice.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regice.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regidrago.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regidrago.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regidrago.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regidrago.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regidrago.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regidrago.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regidrago.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regidrago.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regieleki.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regieleki.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regieleki.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regieleki.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regieleki.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regieleki.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/regieleki.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regieleki.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/regigigas.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regigigas.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/regigigas.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regigigas.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/regigigas.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regigigas.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/regigigas.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regigigas.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regirock.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regirock.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regirock.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regirock.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regirock.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regirock.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/regirock.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/regirock.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/registeel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/registeel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/registeel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/registeel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/registeel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/registeel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/registeel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/registeel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/relicanth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/relicanth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/relicanth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/relicanth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/relicanth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/relicanth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/relicanth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/relicanth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/remoraid.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/remoraid.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/remoraid.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/remoraid.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/remoraid.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/remoraid.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/remoraid.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/remoraid.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reshiram.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reshiram.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reshiram.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reshiram.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reshiram.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reshiram.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reshiram.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reshiram.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reuniclus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reuniclus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reuniclus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reuniclus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reuniclus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reuniclus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/reuniclus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/reuniclus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhydon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhydon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhydon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhydon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhydon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhydon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhydon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhydon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyhorn.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyhorn.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyhorn.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyhorn.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyhorn.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyhorn.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyhorn.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyhorn.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyperior.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyperior.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyperior.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyperior.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyperior.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyperior.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/rhyperior.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rhyperior.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/ribombee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ribombee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/ribombee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ribombee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/ribombee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ribombee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/ribombee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ribombee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rillaboom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rillaboom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/riolu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/riolu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/riolu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/riolu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/riolu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/riolu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/riolu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/riolu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rockruff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rockruff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rockruff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rockruff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rockruff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rockruff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rockruff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rockruff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/roggenrola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roggenrola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/roggenrola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roggenrola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/roggenrola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roggenrola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/roggenrola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roggenrola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rolycoly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rolycoly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rolycoly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rolycoly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rolycoly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rolycoly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rolycoly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rolycoly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rookidee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rookidee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rookidee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rookidee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rookidee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rookidee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/rookidee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rookidee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roselia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roselia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roselia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roselia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roselia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roserade.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roserade.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roserade.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roserade.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roserade.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roserade.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/roserade.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/roserade.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-fan.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-fan.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-fan.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-fan.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-fan.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-fan.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-fan.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-fan.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-frost.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-frost.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-frost.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-frost.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-frost.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-frost.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-frost.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-frost.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-heat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-heat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-heat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-heat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-heat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-heat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-heat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-heat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-mow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-mow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-mow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-mow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-mow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-mow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-mow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-mow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-wash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-wash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-wash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-wash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-wash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-wash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom-wash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom-wash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/rotom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rotom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rowlet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rowlet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rowlet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rowlet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rowlet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rowlet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/rowlet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rowlet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/rufflet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rufflet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/rufflet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rufflet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/rufflet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rufflet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/rufflet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/rufflet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/runerigus.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/runerigus.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/runerigus.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/runerigus.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/runerigus.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/runerigus.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/runerigus.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/runerigus.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sableye.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sableye.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/salamence.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salamence.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salandit.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salandit.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salandit.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salandit.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salandit.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salandit.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salandit.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salandit.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salazzle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salazzle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salazzle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salazzle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salazzle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salazzle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/salazzle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/salazzle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/samurott.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/samurott.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sandaconda.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandaconda.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sandile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sandile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sandile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sandile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandshrew.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandshrew.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sandslash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandslash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/sandygast.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandygast.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/sandygast.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandygast.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/sandygast.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandygast.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/sandygast.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sandygast.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_au.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_au.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_au.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_au.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_au.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_au.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_au.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_au.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_sp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_sp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_sp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_sp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_sp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_sp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_sp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_sp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_su.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_su.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_su.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_su.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_su.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_su.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_su.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_su.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_wi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_wi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_wi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_wi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_wi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_wi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sawsbuck_wi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sawsbuck_wi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/scatterbug.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scatterbug.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/scatterbug.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scatterbug.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/scatterbug.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scatterbug.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/scatterbug.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scatterbug.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sceptile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sceptile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scizor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scizor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scolipede.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scolipede.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scolipede.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scolipede.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scolipede.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scolipede.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scolipede.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scolipede.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/scorbunny.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scorbunny.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/scorbunny.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scorbunny.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/scorbunny.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scorbunny.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/scorbunny.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scorbunny.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scrafty.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scrafty.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scrafty.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scrafty.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scrafty.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scrafty.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scrafty.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scrafty.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scraggy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scraggy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scraggy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scraggy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scraggy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scraggy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/scraggy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scraggy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scyther.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scyther.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scyther.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scyther.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scyther.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scyther.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/scyther.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/scyther.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seadra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seadra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seadra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seadra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seadra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seadra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seadra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seadra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seaking.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seaking.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seaking.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seaking.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seaking.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seaking.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seaking.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seaking.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sealeo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sealeo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sealeo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sealeo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sealeo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sealeo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sealeo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sealeo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seedot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seedot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seedot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seedot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seedot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seedot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seedot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seedot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/seel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/seismitoad.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seismitoad.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/seismitoad.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seismitoad.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/seismitoad.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seismitoad.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/seismitoad.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seismitoad.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sentret.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sentret.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sentret.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sentret.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sentret.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sentret.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sentret.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sentret.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/serperior.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/serperior.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/serperior.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/serperior.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/serperior.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/serperior.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/serperior.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/serperior.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/servine.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/servine.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/servine.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/servine.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/servine.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/servine.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/servine.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/servine.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seviper.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seviper.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seviper.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seviper.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seviper.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seviper.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/seviper.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/seviper.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sewaddle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sewaddle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sewaddle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sewaddle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sewaddle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sewaddle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sewaddle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sewaddle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/sharpedo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sharpedo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-land.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-land.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-land.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-land.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-land.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-land.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-land.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-land.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-sky.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-sky.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-sky.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-sky.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-sky.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-sky.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shaymin-sky.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shaymin-sky.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shedinja.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shedinja.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shedinja.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shedinja.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shedinja.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shedinja.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shedinja.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shedinja.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shelgon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelgon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shelgon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelgon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shelgon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelgon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shelgon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelgon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/shellder.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellder.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/shellder.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellder.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/shellder.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellder.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/shellder.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellder.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_east.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_east.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_east.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_east.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_east.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_east.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_east.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_east.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_west.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_west.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_west.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_west.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_west.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_west.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shellos_west.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shellos_west.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/shelmet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelmet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/shelmet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelmet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/shelmet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelmet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/shelmet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shelmet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shieldon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shieldon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shieldon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shieldon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shieldon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shieldon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shieldon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shieldon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shiftry.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiftry.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shiftry.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiftry.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shiftry.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiftry.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shiftry.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiftry.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/shiinotic.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiinotic.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/shiinotic.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiinotic.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/shiinotic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiinotic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/shiinotic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shiinotic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shinx.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shinx.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shinx.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shinx.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shinx.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shinx.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/shinx.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shinx.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shroomish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shroomish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shroomish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shroomish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shroomish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shroomish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shroomish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shroomish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/shuckle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuckle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/shuckle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuckle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/shuckle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuckle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/shuckle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuckle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shuppet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuppet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shuppet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuppet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shuppet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuppet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/shuppet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/shuppet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sigilyph.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sigilyph.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sigilyph.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sigilyph.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sigilyph.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sigilyph.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/sigilyph.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sigilyph.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/silcoon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silcoon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/silcoon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silcoon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/silcoon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silcoon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/silcoon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silcoon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/silicobra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silicobra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/silicobra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silicobra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/silicobra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silicobra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/silicobra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silicobra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_bug.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_bug.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_bug.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_bug.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_dark.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_dark.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_dark.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_dark.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_dragon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_dragon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_dragon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_dragon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_electric.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_electric.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_electric.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_electric.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fairy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fairy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fairy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fairy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fighting.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fighting.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fighting.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fighting.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fire.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fire.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_fire.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_fire.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_flying.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_flying.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_flying.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_flying.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ghost.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ghost.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ghost.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ghost.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_grass.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_grass.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_grass.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_grass.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ground.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ground.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ground.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ground.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ice.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ice.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_ice.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_ice.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_poison.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_poison.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_poison.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_poison.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_psychic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_psychic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_psychic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_psychic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_rock.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_rock.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_rock.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_rock.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_steel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_steel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_steel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_steel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_water.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_water.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/silvally_water.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/silvally_water.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simipour.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simipour.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simipour.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simipour.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simipour.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simipour.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simipour.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simipour.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisage.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisage.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisage.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisage.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisage.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisage.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisage.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisage.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisear.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisear.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisear.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisear.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisear.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisear.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/simisear.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/simisear.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea_fake.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea_fake.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea_fake.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea_fake.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea_nofake.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea_nofake.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sinistea_nofake.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sinistea_nofake.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sirfetchd.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sirfetchd.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sirfetchd.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sirfetchd.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sirfetchd.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sirfetchd.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sirfetchd.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sirfetchd.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sizzlipede.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sizzlipede.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sizzlipede.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sizzlipede.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sizzlipede.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sizzlipede.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sizzlipede.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sizzlipede.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skarmory.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skarmory.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skarmory.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skarmory.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skarmory.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skarmory.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skarmory.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skarmory.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skiddo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiddo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skiddo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiddo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skiddo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiddo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skiddo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiddo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skiploom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiploom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skiploom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiploom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skiploom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiploom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/skiploom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skiploom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/skitty.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skitty.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/skitty.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skitty.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/skitty.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skitty.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/skitty.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skitty.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skorupi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skorupi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skorupi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skorupi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skorupi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skorupi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skorupi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skorupi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skrelp.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skrelp.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skrelp.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skrelp.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skrelp.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skrelp.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/skrelp.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skrelp.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skuntank.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skuntank.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skuntank.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skuntank.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skuntank.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skuntank.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/skuntank.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skuntank.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/skwovet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skwovet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/skwovet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skwovet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/skwovet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skwovet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/skwovet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/skwovet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slaking.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slaking.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slaking.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slaking.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slaking.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slaking.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slaking.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slaking.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slakoth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slakoth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slakoth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slakoth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slakoth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slakoth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/slakoth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slakoth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/sliggoo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sliggoo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowbro.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowbro.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowking.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowking.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/slowpoke.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slowpoke.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/slugma.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slugma.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/slugma.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slugma.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/slugma.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slugma.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/slugma.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slugma.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/slurpuff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slurpuff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/slurpuff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slurpuff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/slurpuff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slurpuff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/slurpuff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/slurpuff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/smeargle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smeargle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/smeargle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smeargle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/smeargle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smeargle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/smeargle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smeargle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/smoochum.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smoochum.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/smoochum.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smoochum.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/smoochum.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smoochum.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/smoochum.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/smoochum.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sneasler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sneasler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/snivy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snivy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/snivy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snivy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/snivy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snivy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/snivy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snivy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/snom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/snom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/snom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/snom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/snorlax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorlax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/snorunt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorunt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/snorunt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorunt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/snorunt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorunt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/snorunt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snorunt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/snover.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snover.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/snover.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snover.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/snover.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snover.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/snover.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snover.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/snubbull.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snubbull.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/snubbull.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snubbull.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/snubbull.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snubbull.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/snubbull.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/snubbull.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sobble.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sobble.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sobble.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sobble.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sobble.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sobble.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/sobble.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sobble.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solgaleo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solgaleo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solgaleo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/solgaleo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solgaleo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/solosis.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solosis.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/solosis.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solosis.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/solosis.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solosis.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/solosis.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solosis.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/solrock.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solrock.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/solrock.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solrock.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/solrock.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solrock.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/solrock.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/solrock.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/spearow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spearow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/spearow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spearow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/spearow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spearow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/spearow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spearow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/spectrier.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spectrier.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/spectrier.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spectrier.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/spectrier.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spectrier.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/spectrier.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spectrier.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spewpa.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spewpa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spewpa.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spewpa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spewpa.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spewpa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spewpa.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spewpa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spheal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spheal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spheal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spheal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spheal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spheal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spheal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spheal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/spinarak.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinarak.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/spinarak.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinarak.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/spinarak.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinarak.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/spinarak.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinarak.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spinda.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinda.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spinda.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinda.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spinda.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinda.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spinda.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spinda.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/spiritomb.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spiritomb.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/spiritomb.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spiritomb.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/spiritomb.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spiritomb.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/spiritomb.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spiritomb.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spoink.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spoink.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spoink.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spoink.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spoink.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spoink.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/spoink.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spoink.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spritzee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spritzee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spritzee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spritzee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spritzee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spritzee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/spritzee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/spritzee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/squirtle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/squirtle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/squirtle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/squirtle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/squirtle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/squirtle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/squirtle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/squirtle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stakataka.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stakataka.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stakataka.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stakataka.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stakataka.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stakataka.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stakataka.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stakataka.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/stantler.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stantler.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/stantler.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stantler.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/stantler.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stantler.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/stantler.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stantler.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staraptor.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staraptor.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staraptor.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staraptor.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staraptor.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staraptor.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staraptor.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staraptor.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staravia.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staravia.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staravia.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staravia.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staravia.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staravia.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/staravia.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staravia.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/starly.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starly.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/starly.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starly.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/starly.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starly.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/starly.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starly.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/starmie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starmie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/starmie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starmie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/starmie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starmie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/starmie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/starmie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/staryu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staryu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/staryu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staryu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/staryu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staryu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/staryu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/staryu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/steelix.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steelix.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/steenee.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steenee.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/steenee.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steenee.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/steenee.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steenee.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/steenee.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/steenee.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/stonjourner.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stonjourner.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/stonjourner.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stonjourner.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/stonjourner.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stonjourner.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/stonjourner.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stonjourner.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stoutland.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stoutland.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stoutland.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stoutland.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stoutland.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stoutland.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stoutland.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stoutland.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stufful.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stufful.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stufful.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stufful.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stufful.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stufful.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/stufful.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stufful.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/stunfisk.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunfisk.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/stunky.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunky.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/stunky.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunky.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/stunky.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunky.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/stunky.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/stunky.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sudowoodo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sudowoodo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sudowoodo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sudowoodo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sudowoodo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sudowoodo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sudowoodo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sudowoodo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/suicune.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/suicune.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/suicune.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/suicune.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/suicune.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/suicune.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/suicune.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/suicune.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunflora.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunflora.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunflora.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunflora.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunflora.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunflora.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunflora.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunflora.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunkern.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunkern.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunkern.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunkern.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunkern.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunkern.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/sunkern.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sunkern.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/surskit.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/surskit.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/surskit.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/surskit.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/surskit.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/surskit.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/surskit.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/surskit.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swablu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swablu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swablu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swablu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swablu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swablu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swablu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swablu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swadloon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swadloon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swadloon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swadloon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swadloon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swadloon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swadloon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swadloon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swalot.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swalot.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swalot.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swalot.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swalot.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swalot.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swalot.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swalot.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swampert.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swampert.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swanna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swanna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swanna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swanna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swanna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swanna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swanna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swanna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swellow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swellow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swellow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swellow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swellow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swellow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/swellow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swellow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/swinub.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swinub.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/swinub.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swinub.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/swinub.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swinub.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/swinub.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swinub.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/swirlix.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swirlix.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/swirlix.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swirlix.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/swirlix.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swirlix.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/swirlix.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swirlix.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swoobat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swoobat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swoobat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swoobat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swoobat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swoobat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/swoobat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/swoobat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sylveon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sylveon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sylveon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sylveon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sylveon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sylveon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/sylveon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/sylveon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/taillow.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/taillow.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/taillow.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/taillow.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/taillow.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/taillow.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/taillow.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/taillow.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/talonflame.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/talonflame.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/talonflame.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/talonflame.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/talonflame.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/talonflame.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/talonflame.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/talonflame.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangela.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangela.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangela.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangela.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangela.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangela.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangela.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangela.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangrowth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangrowth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangrowth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangrowth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangrowth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangrowth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tangrowth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tangrowth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-bulu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-bulu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-bulu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-bulu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-bulu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-bulu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-bulu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-bulu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-fini.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-fini.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-fini.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-fini.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-fini.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-koko.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-koko.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-koko.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-koko.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-koko.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-koko.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-koko.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-koko.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-lele.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-lele.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-lele.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-lele.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-lele.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-lele.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tapu-lele.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tapu-lele.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tauros.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tauros.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tauros.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tauros.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tauros.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tauros.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tauros.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tauros.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/teddiursa.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/teddiursa.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/teddiursa.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/teddiursa.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/teddiursa.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/teddiursa.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/teddiursa.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/teddiursa.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacool.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacool.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacool.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacool.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacool.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacool.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacool.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacool.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacruel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacruel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacruel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacruel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacruel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacruel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tentacruel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tentacruel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tepig.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tepig.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tepig.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tepig.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tepig.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tepig.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tepig.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tepig.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/terrakion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/terrakion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/terrakion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/terrakion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/terrakion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/terrakion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/terrakion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/terrakion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thievul.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thievul.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thievul.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thievul.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thievul.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thievul.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thievul.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thievul.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/throh.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/throh.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/throh.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/throh.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/throh.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/throh.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/throh.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/throh.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-incarnate.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-incarnate.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-incarnate.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-incarnate.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-incarnate.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-incarnate.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-incarnate.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-incarnate.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-therian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-therian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-therian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-therian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-therian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-therian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/thundurus-therian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thundurus-therian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thwackey.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thwackey.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thwackey.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thwackey.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thwackey.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thwackey.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/thwackey.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/thwackey.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/timburr.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/timburr.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/timburr.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/timburr.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/timburr.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/timburr.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/timburr.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/timburr.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tirtouga.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tirtouga.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tirtouga.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tirtouga.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tirtouga.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tirtouga.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tirtouga.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tirtouga.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/togedemaru.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togedemaru.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/togedemaru.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togedemaru.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/togedemaru.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togedemaru.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/togedemaru.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togedemaru.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togekiss.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togekiss.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togekiss.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togekiss.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togekiss.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togekiss.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togekiss.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togekiss.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togepi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togepi.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togepi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togepi.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togepi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togepi.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togepi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togepi.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togetic.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togetic.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togetic.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togetic.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togetic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togetic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/togetic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/togetic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torchic.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torchic.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torchic.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torchic.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torchic.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torchic.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torchic.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torchic.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torkoal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torkoal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torkoal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torkoal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torkoal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torkoal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/torkoal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torkoal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-incarnate.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-incarnate.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-incarnate.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-incarnate.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-incarnate.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-incarnate.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-incarnate.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-incarnate.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-therian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-therian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-therian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-therian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-therian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-therian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tornadus-therian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tornadus-therian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/torracat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torracat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/torracat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torracat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/torracat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torracat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/torracat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torracat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/torterra.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torterra.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/torterra.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torterra.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/torterra.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torterra.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/torterra.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/torterra.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/totodile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/totodile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/totodile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/totodile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/totodile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/totodile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/totodile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/totodile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toucannon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toucannon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toucannon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toucannon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toucannon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toucannon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toucannon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toucannon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toxapex.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxapex.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toxapex.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxapex.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toxapex.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxapex.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/toxapex.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxapex.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/toxicroak_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxicroak_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-amped.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-amped.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/toxtricity-low-key.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/toxtricity-low-key.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tranquill.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tranquill.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tranquill.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tranquill.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tranquill.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tranquill.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tranquill.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tranquill.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/trapinch.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trapinch.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/trapinch.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trapinch.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/trapinch.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trapinch.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/trapinch.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trapinch.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/treecko.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/treecko.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/treecko.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/treecko.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/treecko.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/treecko.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/treecko.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/treecko.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/trevenant.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trevenant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/trevenant.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trevenant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/trevenant.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trevenant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/trevenant.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trevenant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/tropius.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tropius.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/tropius.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tropius.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/tropius.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tropius.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/tropius.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tropius.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/trubbish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trubbish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/trubbish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trubbish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/trubbish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trubbish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/trubbish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trubbish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/trumbeak.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trumbeak.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/trumbeak.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trumbeak.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/trumbeak.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trumbeak.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/trumbeak.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/trumbeak.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tsareena.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tsareena.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tsareena.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tsareena.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tsareena.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tsareena.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/tsareena.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tsareena.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/turtonator.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtonator.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/turtonator.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtonator.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/turtonator.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtonator.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/turtonator.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtonator.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/turtwig.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtwig.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/turtwig.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtwig.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/turtwig.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtwig.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/turtwig.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/turtwig.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tympole.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tympole.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tympole.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tympole.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tympole.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tympole.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tympole.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tympole.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tynamo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tynamo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tynamo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tynamo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tynamo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tynamo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/tynamo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tynamo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/type-null.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/type-null.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/type-null.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/type-null.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/type-null.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/type-null.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/type-null.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/type-null.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/typhlosion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/typhlosion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/typhlosion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/typhlosion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/tyranitar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyranitar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrantrum.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrantrum.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrantrum.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrantrum.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrantrum.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrantrum.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrantrum.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrantrum.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tyrogue.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrogue.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tyrogue.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrogue.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tyrogue.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrogue.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/tyrogue.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrogue.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrunt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrunt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrunt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrunt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrunt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrunt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/tyrunt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/tyrunt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/umbreon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/umbreon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/umbreon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/umbreon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/umbreon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/umbreon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/umbreon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/umbreon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/unfezant_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unfezant_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_a.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_a.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_a.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_a.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_b.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_b.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_b.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_b.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_c.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_c.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_c.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_c.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_d.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_d.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_d.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_d.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_e.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_e.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_e.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_e.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_ex.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_ex.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_ex.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_ex.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_f.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_f.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_f.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_f.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_g.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_g.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_g.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_g.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_h.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_h.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_h.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_h.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_i.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_i.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_i.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_i.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_j.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_j.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_j.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_j.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_k.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_k.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_k.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_k.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_l.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_l.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_l.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_l.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_m.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_m.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_m.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_m.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_n.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_n.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_n.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_n.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_o.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_o.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_o.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_o.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_p.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_p.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_p.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_p.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_q.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_q.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_q.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_q.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_qu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_qu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_qu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_qu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_r.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_r.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_r.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_r.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_s.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_s.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_s.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_s.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_t.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_t.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_t.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_t.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_u.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_u.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_u.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_u.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_v.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_v.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_v.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_v.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_w.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_w.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_w.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_w.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_x.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_x.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_x.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_x.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_y.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_y.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_y.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_y.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_z.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_z.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/unown_z.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/unown_z.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaluna.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaluna.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaluna.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaluna.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaluna.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaring.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaring.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaring.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaring.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaring.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaring.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/ursaring.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/ursaring.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-rapid-strike-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-rapid-strike-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-rapid-strike-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-rapid-strike-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_rapid.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_rapid.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_rapid.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_rapid.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-rapid-strike.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-single-strike-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-single-strike-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-single-strike-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu-single-strike-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_single.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_single.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_single.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/urshifu_single.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/urshifu-single-strike.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/uxie.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/uxie.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/uxie.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/uxie.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/uxie.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/uxie.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/uxie.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/uxie.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillish.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillish.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillish.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillish.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillish.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillish.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillish.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillish.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillite.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillite.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillite.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillite.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillite.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillite.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanillite.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanillite.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanilluxe.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanilluxe.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanilluxe.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanilluxe.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanilluxe.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanilluxe.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vanilluxe.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vanilluxe.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vaporeon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vaporeon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vaporeon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vaporeon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vaporeon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vaporeon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vaporeon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vaporeon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/venipede.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venipede.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/venipede.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venipede.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/venipede.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venipede.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/venipede.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venipede.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venomoth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venomoth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venomoth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venomoth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venomoth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venomoth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venomoth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venomoth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venonat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venonat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venonat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venonat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venonat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venonat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venonat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venonat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-gmax.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-gmax.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-gmax.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-gmax.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-gmax.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-gmax.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-gmax.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-gmax.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-mega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-mega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-mega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-mega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-mega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-mega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur-mega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur-mega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_female.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_female.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_female.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_female.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_female.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_female.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_female.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_female.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_male.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_male.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_male.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_male.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_male.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_male.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/venusaur_male.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/venusaur_male.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/vespiquen.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vespiquen.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/vespiquen.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vespiquen.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/vespiquen.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vespiquen.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/vespiquen.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vespiquen.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vibrava.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vibrava.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vibrava.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vibrava.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vibrava.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vibrava.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vibrava.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vibrava.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/victini.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/victini.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/victini.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/victini.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victini.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/victreebel.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victreebel.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/victreebel.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victreebel.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/victreebel.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victreebel.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/victreebel.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/victreebel.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vigoroth.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vigoroth.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vigoroth.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vigoroth.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vigoroth.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vigoroth.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/vigoroth.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vigoroth.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/vikavolt.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vikavolt.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/vikavolt.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vikavolt.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/vikavolt.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vikavolt.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/vikavolt.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vikavolt.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vileplume.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vileplume.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vileplume.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vileplume.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vileplume.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vileplume.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vileplume.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vileplume.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/virizion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/virizion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/virizion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/virizion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/virizion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/virizion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/virizion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/virizion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/vivillon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vivillon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/vivillon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vivillon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/vivillon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vivillon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/vivillon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vivillon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/volbeat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volbeat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/volbeat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volbeat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/volbeat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volbeat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/volbeat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volbeat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/volcanion.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcanion.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/volcanion.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcanion.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/volcanion.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcanion.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/volcanion.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcanion.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/volcarona.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcarona.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/volcarona.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcarona.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/volcarona.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcarona.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/volcarona.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/volcarona.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/voltorb.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/voltorb.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vullaby.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vullaby.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vullaby.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vullaby.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vullaby.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vullaby.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/vullaby.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vullaby.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix-alola.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix-alola.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix-alola.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix-alola.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix-alola.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix-alola.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix-alola.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix-alola.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/vulpix.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/vulpix.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailmer.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailmer.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailmer.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailmer.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailmer.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailmer.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailmer.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailmer.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailord.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailord.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailord.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailord.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailord.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailord.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wailord.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wailord.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/walrein.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/walrein.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/walrein.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/walrein.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/walrein.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/walrein.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/walrein.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/walrein.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wartortle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wartortle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wartortle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wartortle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wartortle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wartortle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wartortle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wartortle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/watchog.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/watchog.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/watchog.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/watchog.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/watchog.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/watchog.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/watchog.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/watchog.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/weavile.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weavile.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/weavile.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weavile.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/weavile.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weavile.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/weavile.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weavile.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weedle.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weedle.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weedle.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weedle.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weedle.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weedle.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weedle.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weedle.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weepinbell.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weepinbell.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weepinbell.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weepinbell.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weepinbell.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weepinbell.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weepinbell.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weepinbell.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/weezing.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/weezing.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whimsicott.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whimsicott.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whimsicott.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whimsicott.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whimsicott.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whimsicott.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whimsicott.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whimsicott.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whirlipede.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whirlipede.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whirlipede.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whirlipede.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whirlipede.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whirlipede.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/whirlipede.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whirlipede.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whiscash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whiscash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whiscash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whiscash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whiscash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whismur.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whismur.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whismur.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whismur.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whismur.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whismur.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/whismur.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/whismur.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wigglytuff.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wigglytuff.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wigglytuff.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wigglytuff.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wigglytuff.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wigglytuff.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/wigglytuff.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wigglytuff.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wimpod.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wimpod.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wimpod.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wimpod.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wimpod.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wimpod.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wimpod.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wimpod.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wingull.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wingull.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wingull.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wingull.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wingull.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wingull.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wingull.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wingull.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi-school.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-school.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi-school.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-school.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi-school.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-school.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi-school.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-school.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-solo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-solo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-solo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/wishiwashi.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wishiwashi-solo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wobbuffet.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wobbuffet.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wobbuffet.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wobbuffet.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wobbuffet.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wobbuffet.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wobbuffet.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wobbuffet.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/woobat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/woobat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/woobat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/woobat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/woobat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/woobat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/woobat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/woobat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/wooloo.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooloo.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/wooloo.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooloo.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/wooloo.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooloo.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/wooloo.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooloo.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wooper.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooper.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wooper.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooper.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wooper.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooper.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wooper.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wooper.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-plant.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-plant.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-plant.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-plant.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-sandy.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-sandy.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-sandy.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-sandy.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-sandy.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-sandy.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-sandy.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-sandy.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-trash.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-trash.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-trash.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-trash.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-trash.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-trash.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/models/wormadam-trash.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wormadam-trash.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wurmple.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wurmple.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wurmple.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wurmple.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wurmple.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wurmple.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/wurmple.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wurmple.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wynaut.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wynaut.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wynaut.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wynaut.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wynaut.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wynaut.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wynaut.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wynaut.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wyrdeer.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wyrdeer.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wyrdeer.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wyrdeer.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wyrdeer.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wyrdeer.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/wyrdeer.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/wyrdeer.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/xatu.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xatu.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/xatu.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xatu.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/xatu.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xatu.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/xatu.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xatu.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/xerneas.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xerneas.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/xerneas.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xerneas.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/xerneas.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xerneas.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/xerneas.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xerneas.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/xurkitree.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xurkitree.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/xurkitree.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xurkitree.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/xurkitree.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xurkitree.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/xurkitree.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/xurkitree.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/yamask.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamask.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/yamper.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamper.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/yamper.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamper.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/yamper.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamper.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/yamper.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yamper.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanma.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanma.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanma.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanma.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanma.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanma.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanma.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanma.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanmega.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanmega.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanmega.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanmega.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanmega.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanmega.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/models/yanmega.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yanmega.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/yungoos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yungoos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/yungoos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yungoos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/yungoos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yungoos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/yungoos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yungoos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/yveltal.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yveltal.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/yveltal.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yveltal.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/yveltal.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yveltal.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/yveltal.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/yveltal.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian-crowned.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian-crowned.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian-crowned.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian-crowned.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian-crowned.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian-crowned.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian-crowned.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian-crowned.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zacian.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zacian.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta-crowned.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta-crowned.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta-crowned.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta-crowned.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta-crowned.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta-crowned.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta-crowned.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta-crowned.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zamazenta.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zamazenta.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zangoose.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zangoose.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zangoose.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zangoose.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zangoose.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zangoose.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zangoose.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zangoose.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zapdos.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zapdos.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zarude.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zarude.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zarude.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zarude.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zarude.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zarude.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/models/zarude.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zarude.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zebstrika.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zebstrika.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zebstrika.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zebstrika.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zebstrika.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zebstrika.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zebstrika.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zebstrika.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zekrom.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zekrom.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zekrom.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zekrom.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zekrom.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zekrom.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zekrom.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zekrom.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/zeraora.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zeraora.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/zeraora.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zeraora.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/models/zeraora.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zeraora.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/models/zeraora.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zeraora.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon-galar.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon-galar.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon-galar.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon-galar.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon-galar.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon-galar.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon-galar.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon-galar.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/models/zigzagoon.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zigzagoon.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zoroark.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zoroark.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua-hisui.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua-hisui.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua-hisui.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua-hisui.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua-hisui.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua-hisui.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua-hisui.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua-hisui.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zorua.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zorua.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zubat.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zubat.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zubat.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zubat.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zubat.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zubat.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/models/zubat.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zubat.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zweilous.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zweilous.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zweilous.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zweilous.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zweilous.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zweilous.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/models/zweilous.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zweilous.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-10.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-10.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-10.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-10.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-10.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-10.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-10.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-10.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-50.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-50.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-50.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-50.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-50.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-50.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde-50.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-50.xml
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde_100.x3d b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-complete.x3d
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde_100.x3d
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-complete.x3d
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde_100.xml b/src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-complete.xml
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/models/zygarde_100.xml
rename to src/main/resources/assets/pokecube_mobs/models/entity/pokemob/zygarde-complete.xml
diff --git a/src/generated/resources/assets/pokecube_mobs/sounds.json b/src/main/resources/assets/pokecube_mobs/sounds.json
similarity index 100%
rename from src/generated/resources/assets/pokecube_mobs/sounds.json
rename to src/main/resources/assets/pokecube_mobs/sounds.json
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/abomasnowmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abomasnowmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/abra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/abra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/abra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/abra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/abra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/absolmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/absolmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgorhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgorhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgorhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgorhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgorhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgorhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/accelgorhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/accelgorhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-blade.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-blade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-blade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-blade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-blade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-blade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-blade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-blade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-shield.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-shield.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-shield.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-shield.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-shield_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-shield_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash-shield_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash-shield_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislashhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislashhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislashhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislashhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislashhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislashhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aegislashhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aegislashhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_meye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_meye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_meye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_meye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_meye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_meye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_meye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_meye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/aerodactyleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aerodactyleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggron_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggron_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggroneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggroneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggroneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggroneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggroneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggroneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggroneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggroneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggronmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggronmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggronmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aggronmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aggronmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/aipomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aipomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_mega_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_mega_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_mega_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_mega_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_mega_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_mega_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_mega_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_mega_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazam_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazam_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazameye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazameye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazameye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazameye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazameye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazamhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazamhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazamhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazamhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazamhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazamhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/alakazamhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alakazamhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiegeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiegeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiegeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiegeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiegeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiegeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiegeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiegeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/alcremiehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alcremiehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/alomomola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alomomola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/alomomola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alomomola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/alomomola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alomomola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/alomomola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/alomomola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/altaria_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/altaria_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amaura.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amaura.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amaura.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amaura.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amaura_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amaura_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amaura_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amaura_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amauraeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amauraeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amauraeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amauraeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amauraeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amauraeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/amauraeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amauraeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ambipomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ambipomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/amoonguss.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amoonguss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/amoonguss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amoonguss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/amoonguss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amoonguss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/amoonguss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/amoonguss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharoseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharoseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharoseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharoseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharoseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharoseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ampharoseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ampharoseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/anorith.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/anorith.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/anorith.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/anorith.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/anorith_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/anorith_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/anorith_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/anorith_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletun_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletun_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunbody.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunbody.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunbody.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunbody.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunbody_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunbody_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunbody_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunbody_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletuneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletuneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletuneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletuneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletuneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletuneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletuneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletuneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/appletunghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/appletunghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applinbody.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applinbody.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applinbody.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applinbody.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applinbody_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applinbody_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applinbody_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applinbody_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/applineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/applineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanid.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanideye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanideye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanideye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanideye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanideye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanideye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/araquanideye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/araquanideye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbok.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbok.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbok.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbok.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbok_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbok_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbok_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbok_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbokhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbokhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbokhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbokhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbokhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbokhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arbokhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arbokhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_hisui_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_hisui_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_hisui_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_hisui_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_hisui_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_hisui_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_hisui_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_hisui_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanineeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanineeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanineeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanineeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanineeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanineeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/arcanineeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arcanineeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_dragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_dragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_electric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_electric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_electric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_electric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_electric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_electric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_electric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_electric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_grass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_grass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_grass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_grass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_grass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_grass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_grass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_grass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ground.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_water.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_water_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_water_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceus_water_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceus_water_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusbug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusbug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusbug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusbug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusbug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusbug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusbug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusbug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdefault.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdefault.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdefault.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdefault.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdefault_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdefault_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdefault_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdefault_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusdragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusdragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuselectric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuselectric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuselectric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuselectric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuselectric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuselectric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuselectric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuselectric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyebug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyebug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyebug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyebug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyebug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyebug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyebug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyebug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyedragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyedragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeelectric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeelectric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeelectric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeelectric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeelectric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeelectric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeelectric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeelectric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyefire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyefire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeflying.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeflying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeflying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeflying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeflying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeflying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeflying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeflying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyegrass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyegrass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyegrass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyegrass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyegrass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyegrass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyegrass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyegrass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeground.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyeice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyeice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepoison.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepoison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepoison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepoison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepoison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepoison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepoison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepoison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepsychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepsychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepsychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepsychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepsychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepsychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyepsychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyepsychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyerock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyerock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyerock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyerock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyerock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyerock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyerock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyerock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyesteel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyesteel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyesteel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyesteel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyesteel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyesteel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyesteel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyesteel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyewater.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyewater.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyewater.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyewater.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyewater_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyewater_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuseyewater_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuseyewater_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusfire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusfire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusflying.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusflying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusflying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusflying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusflying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusflying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusflying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusflying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusgrass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusgrass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusgrass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusgrass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusgrass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusgrass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusgrass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusgrass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusground.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspoison.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspoison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspoison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspoison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspoison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspoison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspoison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspoison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspsychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspsychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspsychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspsychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspsychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspsychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuspsychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuspsychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusrock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusrock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusrock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusrock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusrock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusrock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceusrock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceusrock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceussteel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceussteel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceussteel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceussteel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceussteel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceussteel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceussteel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceussteel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuswater.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuswater.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuswater.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuswater.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuswater_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuswater_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/arceuswater_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arceuswater_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archenhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archenhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archenhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archenhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archenhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archenhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archenhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archenhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeops.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeopshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeopshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeopshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeopshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeopshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeopshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/archeopshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/archeopshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovisheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovisheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovisheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovisheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovisheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovisheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctovisheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctovisheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctozolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctozolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctozolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctozolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctozolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctozolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arctozolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arctozolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariados.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariados.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariados.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariados.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariados_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariados_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariados_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariados_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariadoshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariadoshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariadoshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariadoshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariadoshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariadoshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ariadoshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ariadoshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/armaldoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/armaldoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatisse.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatisse.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatisse.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatisse.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatisse_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatisse_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatisse_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatisse_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatissehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatissehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatissehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatissehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatissehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatissehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aromatissehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aromatissehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aron.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aron.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aron.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aron.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aron_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aron_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aron_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aron_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aroneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aroneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aroneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aroneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aroneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aroneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/aroneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aroneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokuda.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokuda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokuda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokuda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokuda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokuda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokuda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokuda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokudahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokudahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokudahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokudahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokudahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokudahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/arrokudahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/arrokudahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_galar_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_galar_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_galar_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_galar_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_galar_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_galar_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_galar_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_galar_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articuno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articuno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articunoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articunoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articunoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articunoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articunoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articunoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/articunoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/articunoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/audinomouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/audinomouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aurorus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aurorus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aurorus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aurorus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aurorus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aurorus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/aurorus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/aurorus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/auroruseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/auroruseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/auroruseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/auroruseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/auroruseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/auroruseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/auroruseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/auroruseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugg_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugg_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avaluggeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avaluggeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avaluggeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avaluggeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avaluggeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avaluggeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avaluggeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avaluggeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugghisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugghisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugghisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugghisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugghisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugghisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/avalugghisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/avalugghisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axew.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axeweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axeweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axeweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axeweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axeweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axeweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/axeweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/axeweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/azelfmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azelfmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azumarill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azumarill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azumarill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azumarill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azumarill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azumarill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azumarill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azumarill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurilleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurilleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurilleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurilleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurilleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurilleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/azurilleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/azurilleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/bagonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bagonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/baltoy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/baltoy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/baltoy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/baltoy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/baltoy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/baltoy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/baltoy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/baltoy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banetteeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banetteeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banetteeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banetteeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banetteeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banetteeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/banetteeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/banetteeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracleeyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracleeyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracleeyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracleeyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracleeyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracleeyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/barbaracleeyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barbaracleeyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboach.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboach.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboach.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboach.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboach_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboach_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboach_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboach_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboachmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboachmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboachmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboachmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboachmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboachmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/barboachmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barboachmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewda.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewdahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewdahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewdahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewdahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewdahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewdahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/barraskewdahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/barraskewdahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegion-female.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegion-female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegion-female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegion-female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegion-female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegion-female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegion-female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegion-female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegioneyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegioneyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegioneyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegioneyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegioneyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegioneyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegioneyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegioneyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionfemaleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionfemaleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionfemaleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionfemaleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionfemaleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionfemaleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionfemaleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionfemaleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculegionm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculegionm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin-white-striped.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin-white-striped.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin-white-striped_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin-white-striped_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_blue.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_blue.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_blue.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_blue.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_blue_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_blue_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_blue_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_blue_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_red.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_red.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_red.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_red.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_red_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_red_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculin_red_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculin_red_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinblueeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinblueeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinblueeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinblueeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinblueeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinblueeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinblueeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinblueeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinredeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinredeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinredeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinredeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinredeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinredeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinredeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinredeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinwhiteeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinwhiteeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinwhiteeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinwhiteeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinwhiteeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinwhiteeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/basculinwhiteeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/basculinwhiteeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bastiodoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bastiodoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleefeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleefeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleefeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleefeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleefeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleefeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bayleefeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bayleefeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beartic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beartic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beartic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beartic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beartic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beartic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beartic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beartic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bearticeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bearticeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bearticeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bearticeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bearticeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bearticeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bearticeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bearticeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beautifly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beautifly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beautifly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beautifly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beautifly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beautifly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beautifly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beautifly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/beedrill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beedrill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyemhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyemhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyemhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyemhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyemhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyemhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/beheeyemhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beheeyemhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldum.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldumeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldumeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldumeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldumeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldumeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldumeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/beldumeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/beldumeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellossomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellossomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellsprout.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellsprout.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellsprout.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellsprout.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellsprout_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellsprout_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bellsprout_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bellsprout_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bergmite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bergmite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bergmite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bergmite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bergmite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bergmite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bergmite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bergmite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewear.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewearhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewearhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewearhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewearhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewearhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewearhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bewearhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bewearhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bibarel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bibarel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bibarel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bibarel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bibarel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bibarel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bibarel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bibarel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bidoof.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bidoof.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bidoof.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bidoof.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bidoof_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bidoof_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bidoof_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bidoof_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binacle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binacle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binacle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binacle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binacle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binacle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binacle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binacle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binaclehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binaclehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binaclehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binaclehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binaclehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binaclehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/binaclehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/binaclehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharpeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharpeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharpeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharpeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharpeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharpeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bisharpeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bisharpeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/blacephalon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blacephalon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/blacephalon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blacephalon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/blacephalon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blacephalon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/blacephalon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blacephalon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_geye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_geye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_geye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_geye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_geye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_geye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_geye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_geye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_mega_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_mega_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_mega_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_mega_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_mega_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_mega_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_mega_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_mega_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoisehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoisehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoisehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoisehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoisehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoisehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blastoisehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blastoisehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blaziken_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blaziken_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikeneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikeneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikeneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikeneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikeneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikeneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikeneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikeneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenfire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenfire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenfire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenfire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenfire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenfire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenfire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenfire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/blazikenmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blazikenmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbughead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbughead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbughead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbughead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbughead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbughead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/blipbughead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blipbughead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blissey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blissey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blissey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blissey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blissey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blissey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blissey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blissey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blisseyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blisseyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blisseyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blisseyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blisseyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blisseyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/blisseyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blisseyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/blitzle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blitzle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/blitzle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blitzle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/blitzle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blitzle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/blitzle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/blitzle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bluecoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bluecoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bluecoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bluecoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bluecoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bluecoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bluecoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bluecoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/boldore.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boldore.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/boldore.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boldore.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/boldore_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boldore_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/boldore_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boldore_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltund.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltund.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltund.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltund.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltund_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltund_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltund_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltund_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltundhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltundhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltundhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltundhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltundhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltundhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/boltundhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/boltundhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonsly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonsly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonsly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonsly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonsly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonsly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonsly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonsly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonslyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonslyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonslyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonslyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonslyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonslyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/bonslyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bonslyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalanteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalanteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalanteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalanteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalanteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalanteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/bouffalanteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bouffalanteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweethead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweethead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweethead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweethead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweethead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweethead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bounsweethead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bounsweethead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixeneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixeneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixeneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixeneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixeneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixeneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/braixeneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braixeneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_hisui_mark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_hisui_mark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_hisui_mark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_hisui_mark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_hisui_mark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_hisui_mark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_hisui_mark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_hisui_mark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviary_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/braviaryhisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/braviaryhisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/breloom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/breloom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/breloom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/breloom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/breloom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/breloom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/breloom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/breloom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionne.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionne.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionne.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionne.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionne_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionne_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionne_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionne_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/brionnemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/brionnemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzong.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzong.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzong.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzong.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzong_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzong_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzong_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzong_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bronzor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bronzor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxishhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxishhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxishhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxishhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxishhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxishhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bruxishhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bruxishhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bubble.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bubble.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bubble.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bubble.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bubble_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bubble_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/bubble_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bubble_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budew.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budewhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budewhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budewhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budewhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budewhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budewhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/budewhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/budewhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizelhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizelhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizelhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizelhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizelhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizelhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buizelhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buizelhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaureye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaureye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaureye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaureye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaureye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaureye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaureye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaureye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaurmark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaurmark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaurmark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaurmark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaurmark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaurmark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/bulbasaurmark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bulbasaurmark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buneary.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buneary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buneary.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buneary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buneary_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buneary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/buneary_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buneary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bunearyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunearyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bunearyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunearyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bunearyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunearyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/bunearyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunearyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelby.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelbyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelbyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelbyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelbyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelbyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelbyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/bunnelbyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/bunnelbyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmyleafcoat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmyleafcoat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmyleafcoat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmyleafcoat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmyleafcoat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmyleafcoat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmyleafcoat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmyleafcoat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmysandcoat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmysandcoat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmysandcoat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmysandcoat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmysandcoat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmysandcoat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmysandcoat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmysandcoat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmytrashcoat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmytrashcoat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmytrashcoat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmytrashcoat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmytrashcoat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmytrashcoat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/burmytrashcoat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/burmytrashcoat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/butterfree_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/butterfree_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwole.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwolewing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwolewing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwolewing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/buzzwolewing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/buzzwolewing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacnea.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacnea.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacnea.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacnea.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacnea_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacnea_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacnea_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacnea_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturne.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturne.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturne.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturne.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturne_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturne_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturne_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturne_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cacturneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cacturneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrex.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrexeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrexeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrexeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrexeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrexeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrexeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/calyrexeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/calyrexeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/camerupteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/camerupteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cameruptmeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cameruptmeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cameruptmeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cameruptmeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cameruptmeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cameruptmeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cameruptmeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cameruptmeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/carbink.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carbink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/carbink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carbink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/carbink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carbink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/carbink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carbink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkol.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkolhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkolhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkolhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkolhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkolhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkolhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/carkolhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carkolhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivinehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivinehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivinehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivinehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivinehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivinehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/carnivinehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carnivinehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracosta.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracosta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracosta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracosta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracosta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracosta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracosta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracosta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracostahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracostahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracostahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracostahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracostahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracostahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/carracostahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carracostahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanha.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanha.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanha.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanha.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanha_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanha_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanha_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanha_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanhahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanhahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanhahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanhahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanhahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanhahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/carvanhahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/carvanhahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cascoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cascoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-rainy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-rainy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-rainy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-rainy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-rainy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-rainy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-rainy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-rainy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-snowy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-snowy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-snowy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-snowy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-snowy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-snowy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-snowy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-snowy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-sunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-sunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-sunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-sunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-sunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-sunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform-sunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform-sunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castform_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castform_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformrain.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformrain.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformrain.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformrain.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformrain_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformrain_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformrain_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformrain_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformraineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformraineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformraineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformraineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformraineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformraineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformraineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformraineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnoweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnoweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnoweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnoweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnoweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnoweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsnoweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsnoweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsun.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsun_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsun_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsun_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsun_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsuneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsuneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsuneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsuneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsuneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsuneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/castformsuneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/castformsuneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/caterpie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/caterpie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/caterpie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/caterpie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/caterpie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/caterpie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/caterpie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/caterpie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebihead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebihead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebihead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebihead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebihead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebihead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/celebihead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celebihead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteela.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteela.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteela.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteela.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteela_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteela_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteela_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteela_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteelaface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteelaface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteelaface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteelaface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteelaface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteelaface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/celesteelaface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/celesteelaface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorch_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorch_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorcheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorcheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorcheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorcheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorcheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorcheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorcheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorcheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorchgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorchgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorchgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorchgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorchgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorchgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/centiskorchgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/centiskorchgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelure.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelure.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelure.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelure.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelure_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelure_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelure_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelure_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelurehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelurehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelurehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelurehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelurehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelurehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/chandelurehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chandelurehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chansey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chansey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chansey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chansey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chansey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chansey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chansey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chansey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chanseyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chanseyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chanseyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chanseyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chanseyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chanseyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/chanseyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chanseyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-x.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-y.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard-mega-y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard-mega-y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgfire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgfire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgfire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgfire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgfire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgfire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgfire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgfire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgmaxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgmaxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgmaxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgmaxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgmaxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgmaxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardgmaxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardgmaxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegaxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegaxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegaxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegaxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegaxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegaxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegaxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegaxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegayeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegayeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegayeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegayeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegayeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegayeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardmegayeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardmegayeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charizardyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charizardyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabughead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabughead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabughead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabughead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabughead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabughead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/charjabughead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charjabughead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmander.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmander.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmander.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmander.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmander_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmander_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmander_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmander_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmandereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmandereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmandereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmandereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmandereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmandereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmandereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmandereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/charmeleoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/charmeleoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatothead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatothead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatothead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatothead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatothead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatothead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chatothead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chatothead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-overcast.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-overcast.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-overcast.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-overcast.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-overcast_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-overcast_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-overcast_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-overcast_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-sunshine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-sunshine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-sunshine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-sunshine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-sunshine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-sunshine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherrim-sunshine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherrim-sunshine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherubi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherubi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherubi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherubi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherubi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherubi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cherubi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cherubi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaught.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaught.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaught.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaught.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaught_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaught_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaught_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaught_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaughthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaughthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaughthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaughthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaughthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaughthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chesnaughthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chesnaughthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespinmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespinmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespinmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespinmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespinmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespinmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/chespinmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chespinmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtlehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtlehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtlehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtlehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtlehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtlehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/chewtlehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chewtlehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikorita.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikorita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikorita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikorita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikorita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikorita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikorita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikorita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikoritahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikoritahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikoritahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikoritahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikoritahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikoritahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chikoritahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chikoritahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimchar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimchar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimcharhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimcharhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimcharhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimcharhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimcharhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimcharhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/chimcharhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimcharhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimecho.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimecho.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimecho.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimecho.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimecho_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimecho_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimecho_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimecho_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimechohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimechohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimechohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimechohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimechohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimechohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chimechohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chimechohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchou.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchouhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchouhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchouhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchouhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchouhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchouhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/chinchouhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chinchouhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chingling.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chingling.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chingling.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chingling.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chingling_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chingling_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/chingling_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/chingling_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccino.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccinohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccinohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccinohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccinohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccinohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccinohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cinccinohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinccinohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderace.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderace.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderace.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderace.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderace_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderace_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderace_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderace_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceballface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceballface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceballface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceballface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceballface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceballface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceballface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceballface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderaceeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderaceeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacefire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacefire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacefire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacefire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacefire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacefire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacefire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacefire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cinderacemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cinderacemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/clamperl.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clamperl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/clamperl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clamperl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/clamperl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clamperl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/clamperl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clamperl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncher.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncher.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncher.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncher.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncher_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncher_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncher_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncher_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncherhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncherhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncherhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncherhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncherhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncherhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clauncherhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clauncherhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzer.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzerhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzerhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzerhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzerhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzerhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzerhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/clawitzerhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clawitzerhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydol.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydoleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydoleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydoleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydoleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydoleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydoleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/claydoleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/claydoleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefable.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefable.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefable.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefable.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefable_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefable_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefable_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefable_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefableeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefableeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefableeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefableeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefableeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefableeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefableeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefableeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/clefairyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clefairyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffa.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cleffaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cleffaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopushead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopushead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopushead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopushead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopushead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopushead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/clobbopushead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/clobbopushead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloyster.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloyster.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloyster.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloyster.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloyster_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloyster_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloyster_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloyster_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloysterhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloysterhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloysterhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloysterhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloysterhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloysterhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cloysterhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cloysterhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/coalossalhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/coalossalhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalioneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalioneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalioneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalioneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalioneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalioneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cobalioneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cobalioneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigushead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigushead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigushead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigushead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigushead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigushead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cofagrigushead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cofagrigushead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeeyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeeyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeyf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeyf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeyf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeyf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeyf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeyf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeyf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeyf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeym.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeym.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeym.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeym.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeym_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeym_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/combeeym_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combeeym_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combusken.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combusken.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combusken.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combusken.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combusken_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combusken_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combusken_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combusken_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combuskeneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combuskeneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combuskeneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combuskeneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combuskeneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combuskeneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/combuskeneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/combuskeneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/comfey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/comfey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/comfey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/comfey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/comfey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/comfey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/comfey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/comfey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurrhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurrhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurrhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurrhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurrhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurrhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/conkeldurrhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/conkeldurrhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajah_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajah_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajaheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajaheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajaheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajaheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajaheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajaheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/copperajaheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/copperajaheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphisheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphisheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphisheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphisheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphisheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphisheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/corphisheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corphisheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/corsola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corsola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknight_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknight_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknighthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknighthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknighthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknighthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknighthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknighthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknighthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknighthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknightmaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknightmaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknightmaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknightmaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknightmaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknightmaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corviknightmaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corviknightmaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquirehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquirehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquirehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquirehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquirehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquirehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/corvisquirehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/corvisquirehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmoem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmoem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmoem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmoem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmoem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmoem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmoem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmoem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmog.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmog.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmog.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmog.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmog_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmog_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmog_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmog_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmogface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmogface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmogface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmogface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmogface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmogface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cosmogface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cosmogface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cottonee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cottonee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cottonee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cottonee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cottonee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cottonee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cottonee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cottonee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominable.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominable.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominable.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominable.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominable_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominable_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominable_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominable_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominablehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominablehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominablehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominablehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominablehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominablehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabominablehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabominablehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawlerhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawlerhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawlerhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawlerhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawlerhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawlerhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/crabrawlerhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crabrawlerhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradily.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradily.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradily.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradily.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradily_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradily_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradily_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradily_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradilyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradilyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradilyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradilyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradilyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradilyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/cradilyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cradilyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramorant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramorant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramorant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramorant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramorant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramorant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramorant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramorant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranteyemissil.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranteyemissil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranteyemissil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranteyemissil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranteyemissil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranteyemissil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranteyemissil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranteyemissil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cramoranthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cramoranthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cranidos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cranidos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cranidos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cranidos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cranidos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cranidos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cranidos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cranidos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/crawdaunteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crawdaunteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresselia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresselia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresselia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresselia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresselia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresselia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresselia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresselia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresseliaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresseliaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresseliaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresseliaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresseliaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresseliaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/cresseliaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cresseliaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/croagunk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croagunk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/croagunk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croagunk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/croagunk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croagunk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/croagunk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croagunk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobathead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobathead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobathead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobathead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobathead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobathead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/crobathead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crobathead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaw.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaw.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaw.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaw.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaw_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaw_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaw_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaw_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/croconaweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/croconaweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/crustle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crustle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/crustle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crustle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/crustle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crustle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/crustle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/crustle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cryogonal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cryogonal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cryogonal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cryogonal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cryogonal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cryogonal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cryogonal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cryogonal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cubchoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubchoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cubchoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubchoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cubchoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubchoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/cubchoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubchoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cubone.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cubone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cubone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cubone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cubone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cuboneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cuboneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cuboneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cuboneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cuboneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cuboneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/cuboneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cuboneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufantback.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufantback.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufantback.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufantback.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufantback_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufantback_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufantback_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufantback_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufanteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufanteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufanteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufanteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufanteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufanteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/cufanteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cufanteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cursola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cursola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutiefly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutiefly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutiefly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutiefly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutiefly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutiefly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutiefly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutiefly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutieflyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutieflyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutieflyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutieflyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutieflyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutieflyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/cutieflyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cutieflyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquil.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquileye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquileye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquileye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquileye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquileye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquileye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/cyndaquileye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/cyndaquileye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkrai.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkrai.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkrai.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkrai.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkrai_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkrai_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkrai_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkrai_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkraihead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkraihead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkraihead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkraihead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkraihead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkraihead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/darkraihead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darkraihead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-standard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-standard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-standard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-standard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_zen_galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-zen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_zen_galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-zen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_zen_galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-zen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_zen_galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-galar-zen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-standard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-standard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-standard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-standard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan-zen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-zen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan-zen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-zen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan-zen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-zen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitan-zen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitan-zen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitangalareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitangalareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitangalareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitangalareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitangalareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitangalareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitangalareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitangalareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darmanitanzmmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darmanitanzmmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/darrow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darrow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/darrow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darrow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/darrow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darrow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/darrow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darrow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrix.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrixhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrixhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrixhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrixhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrixhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrixhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dartrixhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dartrixhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumaka_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumaka_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumakagalareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumakagalareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumakagalareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumakagalareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumakagalareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumakagalareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/darumakagalareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/darumakagalareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyehisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyehisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyehisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyehisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyehisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyehisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/decidueyehisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/decidueyehisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedenne.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedenne.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedenne.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedenne.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedenne_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedenne_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedenne_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedenne_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dedennemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dedennemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_au.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_au.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_au.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_au.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_au_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_au_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_au_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_au_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_sp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_sp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_sp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_sp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_sp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_sp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_sp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_sp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_su.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_su.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_su.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_su.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_su_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_su_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_su_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_su_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_wi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_wi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_wi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_wi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_wi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_wi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deerling_wi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deerling_wi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deino.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/deino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/delcatty.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delcatty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/delcatty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delcatty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/delcatty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delcatty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/delcatty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delcatty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibird.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibird.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibird.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibird.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibird_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibird_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibird_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibird_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibirdeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibirdeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibirdeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibirdeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibirdeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibirdeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/delibirdeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delibirdeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphox.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphox.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphox.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphox.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphox_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphox_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphox_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphox_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphoxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphoxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphoxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphoxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphoxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphoxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/delphoxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/delphoxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-attack.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-attack.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-attack.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-attack.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-attack_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-attack_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-attack_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-attack_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-defense.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-defense.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-defense.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-defense.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-defense_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-defense_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-defense_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-defense_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-normal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-normal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-normal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-normal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-speed.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-speed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-speed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-speed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-speed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-speed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxys-speed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxys-speed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxyseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxyseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxyseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxyseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxyseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxyseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/deoxyseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/deoxyseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dewgong_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewgong_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dewott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dewpider.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewpider.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dewpider.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewpider.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dewpider_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewpider_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dewpider_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dewpider_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dhelmise.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dhelmise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dhelmise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dhelmise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dhelmise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dhelmise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/dhelmise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dhelmise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga-origin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga-origin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga-origin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga-origin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga-origin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga-origin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga-origin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga-origin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgaorigineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgaorigineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgaorigineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgaorigineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgaorigineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgaorigineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/dialgaorigineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dialgaorigineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancieeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancieeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancieeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancieeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancieeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancieeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diancieeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diancieeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersby.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersbyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersbyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersbyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersbyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersbyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersbyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/diggersbyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diggersbyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglettalolahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglettalolahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglettalolahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglettalolahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglettalolahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglettalolahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/diglettalolahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/diglettalolahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/digletthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/digletthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/digletthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/digletthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/digletthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/digletthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/digletthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/digletthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ditto.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ditto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ditto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ditto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ditto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ditto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ditto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ditto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodrio.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodrio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodrio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodrio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodrio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodrio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodrio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodrio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dodriohead2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dodriohead2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduof.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduof.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduof.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduof.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduof_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduof_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduof_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduof_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/doduom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doduom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphaneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphaneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphaneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphaneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphaneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphaneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/donphaneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/donphaneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottlereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottlereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottlereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottlereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottlereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottlereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dottlereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dottlereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doublade.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doublade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doublade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doublade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doublade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doublade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doublade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doublade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doubladehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doubladehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doubladehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doubladehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doubladehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doubladehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/doubladehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/doubladehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovisheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovisheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovisheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovisheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovisheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovisheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracovisheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracovisheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dracozolteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dracozolteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalge.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalge.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalge.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalge.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalge_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalge_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalge_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalge_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalgeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalgeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalgeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalgeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalgeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalgeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/dragalgeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragalgeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapult.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapult.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapult.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapult.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapult_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapult_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapult_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapult_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapulthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapulthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapulthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapulthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapulthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapulthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dragapulthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragapulthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonair.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonair.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonair.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonair.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonair_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonair_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonair_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonair_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonaireye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonaireye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonaireye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonaireye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonaireye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonaireye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonaireye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonaireye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonitehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonitehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonitehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonitehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonitehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonitehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dragonitehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dragonitehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloak.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloakhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloakhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloakhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloakhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloakhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloakhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drakloakhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drakloakhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampa.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/drampaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drampaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapioneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapioneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapioneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapioneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapioneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapioneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drapioneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drapioneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratini.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratinieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratinieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratinieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratinieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratinieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratinieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dratinieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dratinieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednaw_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednaw_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drednawhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drednawhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dreepyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dreepyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblim.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblim.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblim_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblim_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifblimmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifblimmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/driflooneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/driflooneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/driflooneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/driflooneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/driflooneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/driflooneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/driflooneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/driflooneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloonmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloonmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloonmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloonmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloonmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloonmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/drifloonmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drifloonmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/drilbur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drilbur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/drizzileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drizzileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzeehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzeehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzeehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzeehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzeehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzeehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/drowzeehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/drowzeehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/druddigonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/druddigonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwool.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwool.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwool.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwool.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwool_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwool_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwool_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwool_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwooleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwooleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwooleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwooleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwooleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwooleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwooleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwooleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwoolm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwoolm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwoolm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwoolm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwoolm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwoolm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/dubwoolm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dubwoolm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ducklett.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ducklett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ducklett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ducklett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ducklett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ducklett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ducklett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ducklett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duckletthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duckletthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duckletthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duckletthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duckletthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duckletthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duckletthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duckletthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrioalolahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrioalolahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrioalolahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrioalolahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrioalolahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrioalolahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtrioalolahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtrioalolahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtriohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtriohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtriohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtriohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtriohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtriohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/dugtriohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dugtriohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparce.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparce.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparce.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparce.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparce_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparce_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparce_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparce_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparceeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparceeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparceeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparceeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparceeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparceeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/dunsparceeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dunsparceeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duosion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duosion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duosion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duosion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duosion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duosion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duosion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duosion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/duraludonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duraludonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/durant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/durant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/durant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/durant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/durant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/durant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/durant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/durant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duranteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duranteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duranteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duranteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duranteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duranteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/duranteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duranteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclops.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclopshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclopshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclopshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclopshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclopshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclopshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusclopshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusclopshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoir.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoireye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoireye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoireye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoireye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoireye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoireye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoireye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoireye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoirhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoirhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoirhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoirhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoirhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoirhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dusknoirhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dusknoirhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskull.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskullhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskullhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskullhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskullhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskullhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskullhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/duskullhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/duskullhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dustox.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dustox.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dustox.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dustox.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dustox_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dustox_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/dustox_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dustox_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dwebble.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dwebble.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dwebble.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dwebble.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dwebble_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dwebble_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/dwebble_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/dwebble_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektrik.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektrik.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektrik.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektrik.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektrik_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektrik_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektrik_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektrik_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektross.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektross.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektross.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektross.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektross_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektross_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/eelektross_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eelektross_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eevee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eevee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eevee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eevee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveeheadm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveeheadm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/eeveem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eeveem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscue.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscue-ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscue.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscue-ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscue_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscue-ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscue_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscue-ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuenohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuenohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuenohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuenohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuenohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuenohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eiscuenohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eiscuenohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekans.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekans.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekans.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekans.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekans_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekans_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekans_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekans_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekanshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekanshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekanshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekanshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekanshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekanshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ekanshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ekanshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegoss.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegoss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegoss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegoss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegoss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegoss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegoss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegoss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegosshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegosshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegosshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegosshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegosshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegosshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eldegosshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eldegosshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzz.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzz.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzz.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzz.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzz_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzz_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzz_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzz_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzzhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzzhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzzhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzzhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzzhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzzhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electabuzzhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electabuzzhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivirehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivirehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivirehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivirehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivirehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivirehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electivirehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electivirehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrike.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrike.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrike.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrike.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrike_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrike_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrike_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrike_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrikeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrikeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrikeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrikeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrikeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrikeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/electrikeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrikeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrode_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrode_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodehisuimouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodehisuimouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodehisuimouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodehisuimouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodehisuimouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodehisuimouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodehisuimouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodehisuimouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/electrodemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/electrodemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekid.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekidhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekidhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekidhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekidhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekidhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekidhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/elekidhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elekidhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyemhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyemhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyemhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyemhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyemhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyemhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/elgyemhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/elgyemhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emboarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emboarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolga.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolgahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolgahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolgahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolgahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolgahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolgahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/emolgahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/emolgahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/empoleonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/empoleonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorusincarnateeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorusincarnateeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorusincarnateeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorusincarnateeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorusincarnateeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorusincarnateeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/enamorusincarnateeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enamorusincarnateeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/entei.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/entei.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/entei.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/entei.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/entei_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/entei_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/entei_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/entei_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/enteieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enteieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/enteieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enteieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/enteieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enteieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/enteieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/enteieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavalier.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavalier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavalier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavalier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavalier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavalier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavalier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavalier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavaliereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavaliereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavaliereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavaliereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavaliereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavaliereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/escavaliereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/escavaliereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/espeoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espeoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurrmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurrmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurrmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurrmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurrmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurrmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/espurrmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/espurrmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_gigantamax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus-eternamax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_gigantamax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus-eternamax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_gigantamax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus-eternamax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_gigantamax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus-eternamax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/eternatus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/eternatus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/excadrill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/excadrill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/excadrill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/excadrill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/excadrill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/excadrill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/excadrill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/excadrill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggcute.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggcute.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggcute.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggcute.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggcute_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggcute_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggcute_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggcute_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye3.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolaeye3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolaeye3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoralolamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoralolamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye3.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutoreye3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutoreye3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutormouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutormouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutormouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutormouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutormouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutormouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/exeggutormouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exeggutormouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploud.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploud.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploud.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploud.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploud_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploud_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploud_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploud_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploudeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploudeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploudeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploudeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploudeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploudeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/exploudeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/exploudeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinks.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinks.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinks.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinks.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinks_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinks_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinks_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinks_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinkshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinkshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinkshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinkshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinkshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinkshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/falinkshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/falinkshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchd_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchd_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdgalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdgalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/farfetchdhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/farfetchdhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearoweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearoweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearoweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearoweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearoweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearoweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fearoweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fearoweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebas.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebashead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebashead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebashead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebashead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebashead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebashead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/feebashead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feebashead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekinmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekinmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekinmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekinmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekinmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekinmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fennekinmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fennekinmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/feraligatreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/feraligatreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferroseed.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferroseed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferroseed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferroseed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferroseed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferroseed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferroseed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferroseed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferrothorn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferrothorn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferrothorn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferrothorn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferrothorn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferrothorn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/ferrothorn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ferrothorn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/finneon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/finneon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flaaffyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flaaffyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebe.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/flabebehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flabebehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_anim.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_anim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_anim.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_anim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_anim_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_anim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_anim_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_anim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_c.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_c.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_c.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_c.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_c_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_c_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flame_c_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_c_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_cyn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_cyn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_cyn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_cyn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_cyn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_cyn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_cyn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_cyn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/flame_hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/flame_infernape.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_infernape.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/flame_infernape.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_infernape.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/flame_infernape_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_infernape_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/flame_infernape_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_infernape_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltre_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltre_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltre_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltre_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_a.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_a.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_a.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_a.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_a_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_a_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_a_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_a_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_b.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_b.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_b.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_b.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_b_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_b_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_b_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_b_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_c.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_c.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_c.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_c.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_c_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_c_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_c_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_c_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_moltres_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_moltres_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_ponyta.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_ponyta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_ponyta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_ponyta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_ponyta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_ponyta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_ponyta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_ponyta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/flame_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_x.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flame_x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flame_x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapple_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapple_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapplebody.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapplebody.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapplebody.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapplebody.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapplebody_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapplebody_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flapplebody_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flapplebody_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/flappleghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flappleghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareonmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareonmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareonmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareonmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareonmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareonmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/flareonmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flareonmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinder.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinder.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinder.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinder.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinder_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinder_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinder_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinder_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinderhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinderhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinderhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinderhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinderhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinderhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchinderhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchinderhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchling.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchling.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchling.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchling.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchling_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchling_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchling_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchling_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchlinghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchlinghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchlinghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchlinghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchlinghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchlinghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/fletchlinghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fletchlinghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzelf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzelf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzelf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzelf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzelf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzelf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/floatzelf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floatzelf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette-eternal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette-eternal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette-eternal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette-eternal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette-eternal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette-eternal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette-eternal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette-eternal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floetteeternalf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floetteeternalf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floetteeternalf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floetteeternalf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floetteeternalf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floetteeternalf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floetteeternalf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floetteeternalf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floettehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floettehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floettehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floettehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floettehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floettehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/floettehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/floettehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florges.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florges.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florges.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florges.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florges_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florges_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florges_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florges_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florgeshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florgeshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florgeshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florgeshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florgeshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florgeshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/florgeshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/florgeshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/flygoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/flygoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/fomantis.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fomantis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/fomantis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fomantis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/fomantis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fomantis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/fomantis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fomantis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/foongus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/foongus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/foongus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/foongus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/foongus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/foongus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/foongus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/foongus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretress.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretress.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretress.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretress.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretress_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretress_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretress_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretress_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretresshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretresshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretresshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretresshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretresshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretresshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/forretresshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/forretresshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/fraxure.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fraxure.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/fraxure.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fraxure.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/fraxure_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fraxure_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/fraxure_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/fraxure_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishfhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishfhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/frillishmhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frillishmhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakieeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakieeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakieeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakieeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakieeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakieeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakieeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakieeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakiemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakiemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakiemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakiemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakiemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakiemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/froakiemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froakiemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadier.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadiereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadiereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadiereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadiereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadiereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadiereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/frogadiereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frogadiereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslasseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslasseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslasseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslasseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslasseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslasseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/froslasseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/froslasseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmotheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmotheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmotheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmotheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmotheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmotheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmotheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmotheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothwing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothwing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothwing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothwing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothwing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothwing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/frosmothwing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/frosmothwing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrou.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrouhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrouhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrouhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrouhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrouhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrouhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/furfrouhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furfrouhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furret.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furret.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furret.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furret.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furret_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furret_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furret_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furret_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furrethead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furrethead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furrethead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furrethead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furrethead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furrethead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/furrethead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/furrethead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabiteeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabiteeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabiteeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabiteeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabiteeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabiteeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gabiteeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gabiteeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/galladeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galladeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/galladeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galladeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/galladeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galladeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/galladeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galladeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademegamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademegamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gallademouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gallademouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantula.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantula.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantula.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantula.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantula_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantula_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantula_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantula_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantulaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantulaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantulaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantulaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantulaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantulaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/galvantulaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/galvantulaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorgtoys_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorgtoys_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodorhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodorhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodormouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodormouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodormouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodormouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodormouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodormouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/garbodormouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garbodormouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchomp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchomp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/garchompmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/garchompmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoireye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoireye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoireye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoireye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoireye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoireye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoireye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoireye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmegamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmegamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gardevoirmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gardevoirmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastlyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastlyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastlyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastlyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastlyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastlyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gastlyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastlyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_east.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_east.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_east.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_east.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_east_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_east_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_east_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_east_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_west.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_west.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_west.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_west.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_west_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_west_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gastrodon_west_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gastrodon_west_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectsdrive.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesectsdrive.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesect_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/genesect_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/genesect_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengargeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengargeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengargeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengargeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengargeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengargeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengargeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengargeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gengarmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gengarmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodude_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodude_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudealolahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudealolahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudealolahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudealolahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudealolahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudealolahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudealolahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudealolahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/geodudehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/geodudehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gible.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gible.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gible.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gible.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gible_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gible_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gible_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gible_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gibleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gibleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gibleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gibleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gibleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gibleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/gibleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gibleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gigalith.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gigalith.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gigalith.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gigalith.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gigalith_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gigalith_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gigalith_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gigalith_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarig.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/girafarighead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/girafarighead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratina.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratina-altered.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratina-altered.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratina-altered_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratina-altered_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratinaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratinaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratinaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratinaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratinaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratinaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/giratinaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/giratinaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceonmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceonmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceonmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceonmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceonmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceonmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/glaceonmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaceonmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalieeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalieeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalieeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalieeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalieeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalieeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glalieeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glalieeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glaliemegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaliemegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glaliemegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaliemegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glaliemegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaliemegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/glaliemegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glaliemegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/glameow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glameow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/glameow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glameow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/glameow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glameow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/glameow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glameow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glastrier.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glastrier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glastrier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glastrier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glastrier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glastrier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glastrier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glastrier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gligareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gligareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscoreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscoreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscoreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscoreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscoreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscoreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/gliscoreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gliscoreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gloomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gloomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/glow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/glow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoathead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoathead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoathead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoathead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoathead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoathead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gogoathead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gogoathead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbateye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbateye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbateye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbateye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbateye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbateye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golbateye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golbateye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/goldeen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goldeen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/goldeen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goldeen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/goldeen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goldeen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/goldeen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goldeen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golduck.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golduck.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golduck.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golduck.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golduck_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golduck_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golduck_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golduck_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemalolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemalolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemalolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemalolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemalolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemalolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemalolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemalolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/golemeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golemeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golett.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/goletthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goletthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/goletthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goletthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/goletthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goletthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/goletthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goletthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopod.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/golisopodhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golisopodhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkbody.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkbody.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkbody.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkbody.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkbody_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkbody_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkbody_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkbody_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/golurkhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/golurkhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodraeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodraeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodraeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodraeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodraeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodraeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodraeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodraeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuimouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuimouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuimouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuimouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuimouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuimouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodrahisuimouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodrahisuimouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodramouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodramouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodramouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodramouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodramouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodramouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goodramouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goodramouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomyface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomyface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomyface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomyface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomyface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomyface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/goomyface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/goomyface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gorebyss.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gorebyss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gorebyss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gorebyss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gorebyss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gorebyss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gorebyss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gorebyss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleurhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleurhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleurhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleurhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleurhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleurhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/gossifleurhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gossifleurhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothitelle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothitelle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gothorita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gothorita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-average.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-average.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-average_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-average_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-large.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-large.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-large.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-large.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-large_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-large_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-large_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-large_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-small.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-small.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-small.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-small.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-small_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-small_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-small_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-small_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-super.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-super.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-super.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-super.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-super_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-super_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/gourgeist-super_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gourgeist-super_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbull.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbulleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbulleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbulleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbulleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbulleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbulleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/granbulleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/granbulleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapploct.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapploct.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapploct.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapploct.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapploct_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapploct_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapploct_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapploct_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapplocteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapplocteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapplocteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapplocteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapplocteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapplocteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grapplocteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grapplocteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/graveler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/graveler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereyealola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereyealola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereyealola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereyealola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereyealola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereyealola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gravelereyealola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gravelereyealola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedent.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedent.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedent.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedent.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedent_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedent_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedent_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedent_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedenteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedenteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedenteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedenteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedenteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedenteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/greedenteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greedenteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/greencoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greencoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/greencoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greencoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/greencoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greencoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/greencoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greencoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja-ash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja-ash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja-ash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja-ash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja-ash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja-ash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja-ash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja-ash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninja_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninja_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaasheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaasheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaasheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaasheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaasheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaasheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaasheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaasheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjawater.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjawater.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjawater.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjawater.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjawater_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjawater_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/greninjawater_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/greninjawater_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/grimer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarlgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarlgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarlgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarlgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarlgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarlgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grimmsnarlgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grimmsnarlgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeymouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeymouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeymouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeymouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeymouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeymouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/grookeymouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grookeymouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/grotle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grotle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/grotle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grotle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/grotle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grotle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/grotle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grotle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon-primal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon-primal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon-primal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon-primal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon-primal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon-primal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon-primal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon-primal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprihead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprihead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprihead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprihead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprihead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprihead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprihead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprihead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalmarks.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalmarks.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalmarks.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalmarks.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalmarks_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalmarks_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/groudonprimalmarks_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/groudonprimalmarks_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grovyleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grovyleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlithe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlithe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlitheeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlitheeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlitheeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlitheeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlitheeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlitheeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/growlitheeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/growlitheeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/grubbineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grubbineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grumpig.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grumpig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grumpig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grumpig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grumpig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grumpig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/grumpig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/grumpig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gulpin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gulpin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gulpin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gulpin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gulpin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gulpin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/gulpin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gulpin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshoos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshoos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshoos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshoos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshoos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshoos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshoos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshoos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshooshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshooshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshooshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshooshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshooshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshooshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/gumshooshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gumshooshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurrhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurrhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurrhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurrhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurrhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurrhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/gurdurrhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gurdurrhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlord.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlord.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlord.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlord.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlord_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlord_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlord_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlord_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlordeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlordeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlordeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlordeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlordeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlordeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/guzzlordeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/guzzlordeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyarados-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyarados-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyarados-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyarados-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyarados-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyarados-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyarados-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyarados-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradoseyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradoseyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/gyaradosmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/gyaradosmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamooeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamooeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamooeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamooeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamooeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamooeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/hakamooeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hakamooeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happiny.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happiny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happiny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happiny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happiny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happiny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happiny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happiny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinymouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinymouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinymouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinymouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinymouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinymouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/happinymouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/happinymouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/hariyama.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hariyama.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/hariyama.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hariyama.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/hariyama_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hariyama_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/hariyama_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hariyama_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatenna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatenna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatenna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatenna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatenna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatenna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatenna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatenna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatennamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatennamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatennamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatennamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatennamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatennamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatennamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatennamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterene.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterene.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterene.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterene.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterene_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterene_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterene_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterene_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattereneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattereneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattereneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattereneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattereneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattereneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattereneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattereneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterenemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterenemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterenemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterenemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterenemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterenemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hatterenemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hatterenemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattrem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattrem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattrem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattrem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattrem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattrem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattrem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattrem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattremhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattremhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattremhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattremhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattremhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattremhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/hattremhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hattremhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/haunter.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haunter.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/haunter.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haunter.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/haunter_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haunter_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/haunter_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haunter_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hauntereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hauntereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hauntereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hauntereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hauntereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hauntereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hauntereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hauntereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawlucha.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawlucha.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawlucha.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawlucha.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawlucha_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawlucha_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawlucha_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawlucha_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hawluchamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hawluchamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxorus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxorus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxorus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxorus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxorus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxorus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxorus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxorus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxoruseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxoruseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxoruseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxoruseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxoruseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxoruseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/haxoruseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/haxoruseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmorhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmorhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmorhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmorhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmorhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmorhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmorhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmorhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmormark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmormark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmormark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmormark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmormark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmormark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/heatmormark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatmormark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/heatran.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatran.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/heatran.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatran.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/heatran_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatran_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/heatran_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heatran_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/heliolisk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heliolisk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/heliolisk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heliolisk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/heliolisk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heliolisk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/heliolisk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heliolisk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioliskhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioliskhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioliskhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioliskhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioliskhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioliskhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioliskhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioliskhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptilehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptilehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptilehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptilehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptilehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptilehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/helioptilehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/helioptilehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracross_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracross_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/heracrosseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/heracrosseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdier.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdierhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdierhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdierhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdierhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdierhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdierhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/herdierhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/herdierhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotaseyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotaseyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippopotasm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippopotasm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdoneyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdoneyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/hippowdonm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hippowdonm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchaneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchaneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchaneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchaneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchaneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchaneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonchaneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonchaneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonlee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonlee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonlee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonlee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonlee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonlee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonlee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonlee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonleehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonleehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonleehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonleehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonleehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonleehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmonleehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmonleehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontop.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontop.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontop.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontop.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontop_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontop_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontop_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontop_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontopeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontopeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontopeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontopeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontopeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontopeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hitmontopeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hitmontopeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ho-oh.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ho-oh.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ho-oh.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ho-oh.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ho-oh_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ho-oh_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ho-oh_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ho-oh_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkrow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkrow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkrow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkrow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkrow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkrow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkrow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkrow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkroweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkroweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkroweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkroweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkroweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkroweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/honchkroweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honchkroweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedge.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedge.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedge.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedge.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedge_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedge_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedge_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedge_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedgeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedgeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedgeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedgeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedgeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedgeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/honedgeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/honedgeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoohhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoohhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoohhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoohhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoohhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoohhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoohhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoohhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa-unbound.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa-unbound.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa-unbound.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa-unbound.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa-unbound_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa-unbound_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa-unbound_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa-unbound_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa_confined.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa_confined.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa_confined_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopa_confined_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopaunboundeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopaunboundeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopaunboundeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopaunboundeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopaunboundeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopaunboundeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/hoopaunboundeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoopaunboundeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothoot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothoot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothoot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothoot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothoot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothoot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothoot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothoot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothooteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothooteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothooteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothooteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothooteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothooteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoothooteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoothooteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppip.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppip.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppip.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppip.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppip_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppip_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppip_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppip_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppipeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppipeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppipeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppipeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppipeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppipeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/hoppipeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hoppipeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horsea.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horsea.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horsea.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horsea.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horsea_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horsea_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horsea_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horsea_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horseahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horseahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horseahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horseahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horseahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horseahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/horseahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/horseahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoommegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoommegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoommegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoommegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoommegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoommegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoommegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoommegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndour.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoureye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoureye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoureye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoureye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoureye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoureye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/houndoureye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/houndoureye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/huntail.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/huntail.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/huntail.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/huntail.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/huntail_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/huntail_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/huntail_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/huntail_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/hydreigoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hydreigoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypno.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypnohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypnohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypnohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypnohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypnohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypnohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/hypnohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/hypnohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuffeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuffeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuffeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuffeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuffeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuffeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/igglybuffeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/igglybuffeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/illumise.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/illumise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/illumise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/illumise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/illumise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/illumise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/illumise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/illumise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimpeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimpeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimpeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimpeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimpeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimpeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/impidimpeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/impidimpeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/incineroareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/incineroareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedee-male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedee-male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeeeyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeeeyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/indeedeem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indeedeem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/indigocoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indigocoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/indigocoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indigocoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/indigocoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indigocoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/indigocoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/indigocoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernape.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernape.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernape.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernape.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernape_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernape_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernape_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernape_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernapeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernapeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernapeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernapeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernapeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernapeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/infernapeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/infernapeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkay.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkay.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkay.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkay.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkay_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkay_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkay_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkay_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkayeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkayeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkayeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkayeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkayeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkayeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/inkayeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inkayeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleongeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleongeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleongeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleongeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleongeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleongeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/inteleongeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/inteleongeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaureye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaureye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaureye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaureye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaureye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaureye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaureye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaureye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurgrass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurgrass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurgrass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurgrass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurgrass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurgrass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurgrass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurgrass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurmark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurmark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurmark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurmark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurmark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurmark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ivysaurmark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ivysaurmark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmooeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmooeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmooeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmooeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmooeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmooeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/jangmooeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jangmooeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicent_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicent_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicent_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicent_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicent_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicent_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicent_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicent_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/jellicentfhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jellicentfhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuffeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuffeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuffeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuffeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuffeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuffeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jigglypuffeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jigglypuffeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/jirachieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jirachieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jolteoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jolteoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltik.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltik.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltik.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltik.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltik_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltik_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltik_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltik_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltikeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltikeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltikeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltikeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltikeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltikeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/joltikeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/joltikeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluffeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluffeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluffeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluffeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluffeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluffeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/jumpluffeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jumpluffeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynx.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynx.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynx.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynx.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynx_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynx_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynx_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynx_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/jynxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/jynxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabuto.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabuto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabuto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabuto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabuto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabuto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabuto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabuto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutops.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutopseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutopseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutopseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutopseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutopseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutopseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kabutopseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kabutopseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabrahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabrahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabrahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabrahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabrahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabrahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kadabrahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kadabrahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kakuna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kakuna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kakuna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kakuna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kakuna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kakuna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kakuna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kakuna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhanbabyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhanbabyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhanbabyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhanbabyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhanbabyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhanbabyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhanbabyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhanbabyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhaneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhaneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhaneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhaneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhaneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhaneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kangaskhaneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kangaskhaneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablast.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablast.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablast.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablast.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablast_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablast_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablast_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablast_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablasthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablasthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablasthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablasthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablasthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablasthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/karrablasthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/karrablasthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kartana.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kartana.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kartana.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kartana.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kartana_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kartana_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kartana_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kartana_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_invisible.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_invisible.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_invisible.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_invisible.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_invisible_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_invisible_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_invisible_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_invisible_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kecleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kecleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-ordinary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-ordinary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-ordinary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-ordinary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo-resolute.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-resolute.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo-resolute.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-resolute.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo-resolute_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-resolute_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeo-resolute_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeo-resolute_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeoresolutehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeoresolutehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeoresolutehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeoresolutehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeoresolutehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeoresolutehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/keldeoresolutehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/keldeoresolutehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdrahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdrahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdrahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdrahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdrahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdrahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingdrahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingdrahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kingler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kingler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglergigantamaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglergigantamaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglergigantamaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglergigantamaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglergigantamaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglergigantamaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglergigantamaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglergigantamaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglerhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglerhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglerhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglerhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglerhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglerhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kinglerhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kinglerhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirlia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirlia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirlia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirlia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirlia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirlia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirlia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirlia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirliahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirliahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirliahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirliahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirliahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirliahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kirliahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kirliahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klang.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavoreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavoreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavoreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavoreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavoreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavoreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/kleavoreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kleavoreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefki.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefki.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefki.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefki.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefki_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefki_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefki_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefki_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefkieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefkieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefkieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefkieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefkieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefkieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/klefkieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klefkieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klink.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klinklang.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klinklang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klinklang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klinklang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klinklang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klinklang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/klinklang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/klinklang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffingeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffingeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffingeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffingeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffingeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffingeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/koffingeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/koffingeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komala.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komala.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komala.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komala.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komala_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komala_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komala_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komala_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komalahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komalahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komalahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komalahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komalahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komalahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/komalahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/komalahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommooeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommooeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommooeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommooeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommooeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommooeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/kommooeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kommooeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabby.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabbyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabbyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/krabbyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krabbyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/kricketune_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kricketune_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorok.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorok.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorok.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorok.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorok_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorok_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorok_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorok_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorokeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorokeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorokeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorokeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorokeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorokeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krokorokeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krokorokeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/krookodileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/krookodileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfumouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfumouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfumouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfumouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfumouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfumouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/kubfumouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kubfumouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre-primal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre-primal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre-primal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre-primal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre-primal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre-primal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre-primal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre-primal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogre_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogre_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreprimaleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreprimaleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreprimaleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreprimaleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreprimaleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreprimaleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/kyogreprimaleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyogreprimaleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-black.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-black.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-black.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-black.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-black_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-black_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-black_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-black_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-white.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-white.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-white.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-white.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-white_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-white_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem-white_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem-white_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyurem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyurem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremblackeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremblackeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremblackeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremblackeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremblackeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremblackeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremblackeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremblackeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/kyuremweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/kyuremweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lairon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lairon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lairon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lairon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lairon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lairon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lairon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lairon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampent.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampent.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampent.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampent.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampent_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampent_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampent_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampent_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampenteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampenteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampenteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampenteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampenteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampenteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lampenteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lampenteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorushead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorushead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorushead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorushead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorushead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorushead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/landorushead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/landorushead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lanturneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lanturneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lapras_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lapras_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprasghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprasghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprasghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprasghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprasghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprasghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprasghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprasghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprashead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprashead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprashead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprashead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprashead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprashead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/laprashead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/laprashead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvesta.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvesta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvesta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvesta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvesta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvesta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvesta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvesta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvestaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvestaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvestaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvestaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvestaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvestaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/larvestaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvestaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/larvitarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/larvitarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latias_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latias_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiaseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiaseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiaseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiaseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiaseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiaseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiaseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiaseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiasmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiasmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiasmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiasmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiasmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiasmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiasmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiasmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latios_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latios_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latioseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latioseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latioseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latioseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latioseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latioseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latioseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latioseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiosmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiosmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiosmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiosmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiosmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiosmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/latiosmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/latiosmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/leafeonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leafeonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavanny.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavanny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavanny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavanny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavanny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavanny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavanny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavanny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyextra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyextra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyextra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyextra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyextra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyextra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyextra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyextra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/leavannyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/leavannyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_skin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_skin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_skin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_skin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_skin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_skin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledian_skin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledian_skin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledyba.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledyba.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledyba.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledyba.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledyba_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledyba_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledyba_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledyba_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledybaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledybaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledybaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledybaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledybaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledybaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ledybaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ledybaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickilicky.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickilicky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickilicky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickilicky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickilicky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickilicky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickilicky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickilicky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitung.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitung.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitung.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitung.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitung_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitung_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitung_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitung_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitunghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitunghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitunghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitunghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitunghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitunghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/lickitunghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lickitunghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/liepard.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/liepard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/liepard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/liepard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/liepard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/liepard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/liepard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/liepard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/light.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/light.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/light.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/light.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/light_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/light_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/light_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/light_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lileep.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lileep.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lileep.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lileep.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lileep_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lileep_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lileep_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lileep_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilligant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilligant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganthisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganthisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganthisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganthisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganthisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganthisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lilliganthisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lilliganthisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipup.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipuphead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipuphead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipuphead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipuphead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipuphead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipuphead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/lillipuphead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lillipuphead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonegalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonegalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonegalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonegalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonegalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonegalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonegalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonegalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/linoonehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/linoonehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/litleohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litleohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/litten.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litten.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/litten.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litten.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/litten_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litten_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/litten_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litten_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/littenhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/littenhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/littenhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/littenhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/littenhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/littenhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/littenhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/littenhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwick.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwick.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwick.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwick.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwick_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwick_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwick_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwick_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwickeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwickeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwickeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwickeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwickeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwickeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/litwickeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/litwickeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombre.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombre.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombre.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombre.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombre_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombre_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombre_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombre_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombrehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombrehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombrehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombrehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombrehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombrehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lombrehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lombrehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyheadmega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyheadmega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyheadmega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyheadmega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyheadmega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyheadmega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lopunnyheadmega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lopunnyheadmega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotad.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotadhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotadhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotadhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotadhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotadhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotadhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lotadhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lotadhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudred.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudred.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudred.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudred.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudred_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudred_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudred_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudred_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudredeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudredeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudredeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudredeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudredeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudredeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/loudredeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/loudredeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucario_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucario_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegamark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegamark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegamark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegamark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegamark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegamark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lucariomegamark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lucariomegamark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ludicolohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ludicolohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugiahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugiahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugiahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugiahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugiahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugiahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/lugiahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lugiahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/lumineon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lumineon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunala.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunala.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunala_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunala_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmark1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmark1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmark1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmark1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmark1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmark1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmark1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmark1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunaladawnmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunaladawnmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunalamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunalamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatone.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatoneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatoneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatoneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatoneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatoneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatoneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/lunatoneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lunatoneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lurantis.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lurantis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lurantis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lurantis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lurantis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lurantis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lurantis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lurantis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/luvdisc.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luvdisc.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/luvdisc.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luvdisc.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/luvdisc_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luvdisc_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/luvdisc_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luvdisc_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxio.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxray.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxray.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxray.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxray.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxray_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxray_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxray_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxray_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxrayeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxrayeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxrayeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxrayeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxrayeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxrayeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/luxrayeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/luxrayeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-dusk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-dusk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-dusk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-dusk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-dusk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-dusk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-dusk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-dusk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midday.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midday.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midday_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midday_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-midnight.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midnight.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-midnight.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midnight.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-midnight_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midnight_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroc-midnight_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroc-midnight_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocduskeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocduskeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocduskeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocduskeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocduskeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocduskeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocduskeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocduskeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroceye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroceye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroceye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroceye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroceye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroceye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanroceye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanroceye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocmidnighteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocmidnighteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocmidnighteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocmidnighteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocmidnighteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocmidnighteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lycanrocmidnighteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/lycanrocmidnighteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machampgigantamaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machampgigantamaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machampgigantamaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machampgigantamaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machampgigantamaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machampgigantamaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machampgigantamaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machampgigantamaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamphead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamphead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamphead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamphead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamphead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamphead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machamphead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machamphead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machoke.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machoke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machoke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machoke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machoke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machoke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machoke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machoke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machokehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machokehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machokehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machokehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machokehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machokehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machokehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machokehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machop.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machop.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machop.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machop.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machop_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machop_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machop_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machop_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machopeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machopeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machopeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machopeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machopeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machopeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machopeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machopeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machophead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machophead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machophead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machophead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machophead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machophead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/machophead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/machophead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magby.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magbyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magbyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magbyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magbyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magbyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magbyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magbyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magbyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/magcargohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magcargohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnamark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnamark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnamark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnamark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnamark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnamark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/magearnamark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magearnamark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpeyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpeyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmarkf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmarkf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmarkf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmarkf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmarkf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmarkf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magikarpmarkf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magikarpmarkf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magmortarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magmortarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemitehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemitehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemitehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemitehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemitehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemitehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnemitehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnemitehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magneton.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magneton.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magneton.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magneton.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magneton_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magneton_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magneton_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magneton_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezone.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezoneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezoneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezoneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezoneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezoneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezoneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/magnezoneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/magnezoneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/makuhita.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/makuhita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/makuhita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/makuhita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/makuhita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/makuhita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/makuhita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/makuhita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/malamareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/malamareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswinehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswinehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswinehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswinehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswinehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswinehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mamoswinehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mamoswinehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/manaphy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manaphy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzz.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzz.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzz.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzz.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzz_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzz_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzz_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzz_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzzhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzzhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzzhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzzhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzzhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzzhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mandibuzzhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mandibuzzhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectrichead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectrichead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectrichead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectrichead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectrichead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectrichead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/manectrichead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/manectrichead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankeyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankeyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankeyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankeyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankeyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankeyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mankeyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mankeyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantineeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantineeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantineeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantineeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantineeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantineeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantineeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantineeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantinemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantinemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantinemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantinemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantinemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantinemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantinemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantinemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantyke.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantyke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantyke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantyke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantyke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantyke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantyke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantyke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mantykemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mantykemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/maractus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/maractus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/maractus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/maractus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/maractus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/maractus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/maractus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/maractus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareanie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareanie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareanie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareanie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareanie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareanie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareanie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareanie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareaniehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareaniehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareaniehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareaniehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareaniehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareaniehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mareaniehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareaniehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mareep.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareep.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mareep.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareep.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mareep_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareep_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mareep_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mareep_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/marill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/marill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/marill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/marill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakalolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakalolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakalolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakalolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakalolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakalolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakalolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakalolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/marowakeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marowakeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadowhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadowhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadowhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadowhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadowhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadowhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/marshadowhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshadowhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtomp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtomp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtomp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtomp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtomp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtomp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtomp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtomp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtompeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtompeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtompeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtompeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtompeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtompeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/marshtompeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/marshtompeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/masquerain.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/masquerain.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/masquerain.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/masquerain.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/masquerain_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/masquerain_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/masquerain_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/masquerain_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilemegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilemegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilemegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilemegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilemegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilemegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mawilemegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mawilemegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medicham_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medicham_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medichammegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medichammegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medichammegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medichammegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medichammegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medichammegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/medichammegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/medichammegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/meditite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meditite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/megakangaskhanbabyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/megakangaskhanbabyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/megakangaskhanbabyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/megakangaskhanbabyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/megakangaskhanbabyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/megakangaskhanbabyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/megakangaskhanbabyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/megakangaskhanbabyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganium.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganium.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganium.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganium.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganium_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganium_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganium_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganium_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumplant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumplant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumplant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumplant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumplant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumplant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/meganiumplant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meganiumplant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/melmetal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/melmetal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-aria.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-aria.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-aria.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-aria.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-aria_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-aria_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-aria_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-aria_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-pirouette.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-pirouette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-pirouette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-pirouette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-pirouette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-pirouette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/meloetta-pirouette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meloetta-pirouette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/meltan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meltan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/meltan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meltan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/meltan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meltan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/meltan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meltan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyef.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticeyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticeyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/meowsticmouthm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowsticmouthm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgcoin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgcoin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgcoin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgcoin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgcoin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgcoin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgcoin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgcoin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/meowthgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/meowthgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mesprit.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mesprit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mesprit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mesprit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mesprit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mesprit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mesprit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mesprit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespriteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespriteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespriteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespriteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespriteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespriteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespriteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespriteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespritmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespritmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespritmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespritmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespritmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespritmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mespritmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mespritmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagross_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagross_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrosseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrosseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrosseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrosseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrosseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrosseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrosseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrosseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrossmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrossmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrossmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrossmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrossmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrossmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metagrossmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metagrossmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metang.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metangeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metangeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metangeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metangeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metangeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metangeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/metangeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metangeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/metapod.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metapod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/metapod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metapod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/metapod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metapod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/metapod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/metapod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mew.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-x.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-y.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo-mega-y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo-mega-y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mewtwo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mewtwo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/midoranmeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/midoranmeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/midoranmeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/midoranmeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienfoohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienfoohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshao.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshao.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshao.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshao.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshao_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshao_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshao_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshao_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshaoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshaoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshaoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshaoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshaoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshaoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/mienshaoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mienshaoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyena.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyenahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyenahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyenahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyenahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyenahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyenahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mightyenahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mightyenahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milcery.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milcery.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milcery.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milcery.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milcery_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milcery_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milcery_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milcery_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milceryeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milceryeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milceryeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milceryeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milceryeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milceryeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/milceryeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milceryeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotichead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotichead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotichead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotichead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotichead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotichead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/milotichead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/milotichead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltank.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltank.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltank.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltank.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltank_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltank_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltank_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltank_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltankhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltankhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltankhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltankhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltankhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltankhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/miltankhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/miltankhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mime-jr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mime-jr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mime-jr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mime-jr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mime-jr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mime-jr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mime-jr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mime-jr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mimikyu-disguised.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mimikyu-disguised.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mimikyu-disguised.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mimikyu-disguised.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mimikyu-disguised_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mimikyu-disguised_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mimikyu-disguised_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mimikyu-disguised_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccino.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccinohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccinohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccinohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccinohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccinohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccinohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/minccinohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minccinohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/minior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minior-red-meteor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/minior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minior-red-meteor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/minior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minior-red-meteor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/minior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minior-red-meteor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minun.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minun_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minun_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minun_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minun_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minunhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minunhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minunhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minunhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minunhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minunhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/minunhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/minunhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavuseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavuseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavuseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavuseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavuseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavuseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavuseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavuseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavusmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavusmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavusmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavusmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavusmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavusmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/misdreavusmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/misdreavusmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagius.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagius.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagius.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagius.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagius_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagius_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagius_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagius_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagiuseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagiuseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagiuseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagiuseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagiuseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagiuseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/mismagiuseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mismagiuseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/missingno.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/missingno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/missingno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/missingno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltres_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltres_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltreseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltreseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltreseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltreseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltreseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltreseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltreseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltreseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltresgalareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltresgalareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltresgalareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltresgalareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltresgalareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltresgalareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/moltresgalareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/moltresgalareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monferno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monferno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monfernohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monfernohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monfernohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monfernohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monfernohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monfernohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/monfernohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/monfernohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelull.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelullhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelullhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelullhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelullhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelullhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelullhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/morelullhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morelullhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgrem.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgrem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgrem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgrem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgrem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgrem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgrem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgrem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morgremmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morgremmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-full-belly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-full-belly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-full-belly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-full-belly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-full-belly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-full-belly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-full-belly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-full-belly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-hangry.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-hangry.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-hangry.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-hangry.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-hangry_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-hangry_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpeko-hangry_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpeko-hangry_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohangryhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohangryhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohangryhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohangryhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohangryhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohangryhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohangryhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohangryhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/morpekohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/morpekohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mothim.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mothim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mothim.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mothim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mothim_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mothim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/mothim_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mothim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-mime_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-mime_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-rime.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-rime.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-rime.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-rime.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-rime_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-rime_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr-rime_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr-rime_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_galar_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_galar_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_galar_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_galar_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_galar_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_galar_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_galar_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_galar_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_mouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_mouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_mouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_mouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_mouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_mouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_mime_mouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_mime_mouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/mr_rime_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mr_rime_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbray.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbray.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbray.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbray.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbray_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbray_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbray_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbray_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbrayeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbrayeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbrayeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbrayeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbrayeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbrayeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudbrayeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudbrayeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/mudkip_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudkip_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdalehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdalehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdalehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdalehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdalehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdalehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/mudsdalehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/mudsdalehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/muk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/muk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/munchlaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munchlaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munnaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munnaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munnaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munnaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munnaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munnaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/munnaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/munnaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkrow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkrow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkrow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkrow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkrow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkrow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkrow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkrow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkroweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkroweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkroweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkroweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkroweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkroweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/murkroweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/murkroweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/musharna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/musharna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/musharna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/musharna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/musharna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/musharna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/musharna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/musharna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadeleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadeleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadeleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadeleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadeleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadeleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/naganadeleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/naganadeleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/natueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/natueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_dawn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dawn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_dawn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dawn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_dawn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dawn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/lunala_dawn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dawn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_dusk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dusk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_dusk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dusk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_dusk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dusk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_dusk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-dusk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma-ultra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-ultra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma-ultra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-ultra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma-ultra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-ultra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma-ultra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma-ultra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozmaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozmaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozmaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozmaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozmaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozmaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/necrozmaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/necrozmaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickit.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickithead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickithead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickithead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickithead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickithead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickithead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/nickithead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nickithead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoking.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidokinghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidokinghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidokinghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidokinghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidokinghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidokinghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidokinghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidokinghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueenhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueenhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueenhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueenhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueenhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueenhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoqueenhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoqueenhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-f.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-m.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoran-m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoran-m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranfeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranfeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranfeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranfeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranfeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranfeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranfeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranfeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranmeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranmeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranmeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranmeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranmeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranmeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidoranmeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidoranmeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorina.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorina.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorina.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorina_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorina_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorino.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/nidorinoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nidorinoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/nihilego.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nihilego.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/nihilego.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nihilego.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/nihilego_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nihilego_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/nihilego_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nihilego_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nincada.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nincada.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nincada.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nincada.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nincada_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nincada_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nincada_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nincada_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetales_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetales_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetalesalolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetalesalolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetalesalolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetalesalolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetalesalolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetalesalolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetalesalolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetalesalolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetaleseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetaleseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetaleseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetaleseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetaleseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetaleseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ninetaleseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninetaleseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjaskwing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjaskwing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjaskwing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjaskwing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjaskwing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjaskwing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ninjaskwing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ninjaskwing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowl.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowlhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowlhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowlhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowlhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowlhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowlhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/noctowlhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noctowlhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noibat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noibat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noibat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noibat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noibat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noibat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noibat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noibat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noivern.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noivern.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noivern.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noivern.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noivern_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noivern_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noivern_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noivern_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noiverneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noiverneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noiverneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noiverneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noiverneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noiverneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/noiverneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/noiverneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nosepass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nosepass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nosepass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nosepass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nosepass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nosepass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nosepass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nosepass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numelhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numelhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numelhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numelhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numelhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numelhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/numelhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/numelhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleaf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleaf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleaf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleaf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleaf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleaf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleaf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleaf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleafhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleafhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleafhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleafhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleafhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleafhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/nuzleafhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/nuzleafhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagooneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagooneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagooneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagooneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagooneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagooneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagooneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagooneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/obstagoonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/obstagoonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octillery.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octillery.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octillery.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octillery.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octillery_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octillery_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octillery_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octillery_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octilleryeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octilleryeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octilleryeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octilleryeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octilleryeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octilleryeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/octilleryeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/octilleryeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddishhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddishhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddishhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddishhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddishhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddishhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/oddishhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oddishhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyte.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyte.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyte.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyte.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyte_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyte_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyte_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyte_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyteeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyteeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyteeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyteeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyteeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyteeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omanyteeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omanyteeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastareye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastareye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastareye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastareye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastareye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastareye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/omastareye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/omastareye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onix.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onixhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onixhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onixhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onixhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onixhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onixhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/onixhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/onixhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangecoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangecoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangecoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangecoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangecoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangecoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangecoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangecoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oranguru.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oranguru.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oranguru.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oranguru.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oranguru_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oranguru_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oranguru_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oranguru_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangurueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangurueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangurueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangurueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangurueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangurueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/orangurueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orangurueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlegigantamaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlegigantamaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlegigantamaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlegigantamaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlegigantamaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlegigantamaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlegigantamaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlegigantamaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/orbeetlehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/orbeetlehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-baile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-baile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-baile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-baile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-baile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-baile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-baile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-baile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pau.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pau.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pau.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pau.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pau_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pau_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pau_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pau_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pom-pom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pom-pom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pom-pom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pom-pom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pom-pom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pom-pom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-pom-pom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-pom-pom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-sensu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-sensu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-sensu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-sensu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-sensu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-sensu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio-sensu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio-sensu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_baile_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_baile_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_baile_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_baile_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_baile_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_baile_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_baile_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_baile_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pau_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pau_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pau_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pau_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pau_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pau_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pau_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pau_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pom-pom_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pom-pom_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pom-pom_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pom-pom_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pom-pom_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pom-pom_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_pom-pom_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_pom-pom_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_sensu_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_sensu_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_sensu_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_sensu_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_sensu_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_sensu_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/oricorio_sensu_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oricorio_sensu_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/oshawott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/oshawott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwil.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwileye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwileye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwileye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwileye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwileye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwileye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/overqwileye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/overqwileye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisuhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisuhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisuhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisuhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisuhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisuhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/pachirisuhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pachirisuhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia-origin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia-origin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia-origin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia-origin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia-origin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia-origin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia-origin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia-origin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaorigineye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaorigineye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaorigineye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaorigineye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaorigineye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaorigineye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/palkiaorigineye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palkiaorigineye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossand.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossand.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossand.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossand.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossand_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossand_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossand_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossand_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossandeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossandeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossandeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossandeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossandeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossandeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/palossandeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palossandeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/palpitoad.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palpitoad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/palpitoad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palpitoad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/palpitoad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palpitoad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/palpitoad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/palpitoad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pancham.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pancham.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pancham.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pancham.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pancham_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pancham_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pancham_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pancham_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchamhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchamhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchamhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchamhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchamhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchamhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchamhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchamhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchammouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchammouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchammouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchammouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchammouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchammouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/panchammouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panchammouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangoro.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangoro.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangoro.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangoro.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangoro_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangoro_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangoro_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangoro_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangorohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangorohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangorohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangorohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangorohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangorohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pangorohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pangorohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpour.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpourhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpourhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpourhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpourhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpourhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpourhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/panpourhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/panpourhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansage.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansage.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansage.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansage.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansage_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansage_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansage_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansage_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansagehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansagehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansagehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansagehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansagehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansagehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansagehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansagehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansear.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansearhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansearhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansearhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansearhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansearhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansearhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pansearhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pansearhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/paras.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/paras.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/paras.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/paras.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/paras_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/paras_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/paras_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/paras_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/parasect.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/parasect.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/parasect.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/parasect.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/parasect_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/parasect_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/parasect_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/parasect_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimianeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimianeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimianeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimianeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimianeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimianeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/passimianeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/passimianeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/patrat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/patrat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/patrat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/patrat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/patrat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/patrat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/patrat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/patrat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pawniard.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pawniard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pawniard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pawniard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pawniard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pawniard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pawniard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pawniard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipper.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipperhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipperhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipperhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipperhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipperhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipperhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pelipperhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pelipperhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserker.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserker.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserker.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserker.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserker_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserker_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserker_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserker_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserkereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserkereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserkereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserkereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserkereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserkereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/perrserkereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/perrserkereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianalolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianalolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianalolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianalolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianalolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianalolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianalolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianalolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/persianeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/persianeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/petilil.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/petilil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/petilil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/petilil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/petilil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/petilil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/petilil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/petilil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/phanpy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phanpy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/phanpy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phanpy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/phanpy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phanpy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/phanpy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phanpy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantump.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantump.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantump.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantump.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantump_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantump_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantump_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantump_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantumphead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantumphead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantumphead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantumphead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantumphead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantumphead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/phantumphead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phantumphead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosa.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosaback.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosaback.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosaback.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosaback.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosaback_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosaback_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosaback_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosaback_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pheromosahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pheromosahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/phione_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/phione_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichuhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichuhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichuhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichuhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichuhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichuhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pichuhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pichuhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeothead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeothead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeothead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeothead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeothead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeothead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeothead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeothead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotto.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeotto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeotto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeottohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeottohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeottohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeottohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeottohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeottohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeottohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeottohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pidgeyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidgeyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidove.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidove.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidove.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidove.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidove_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidove_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidove_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidove_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidoveeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidoveeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidoveeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidoveeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidoveeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidoveeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pidoveeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pidoveeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pigniteeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pigniteeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pigniteeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pigniteeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pigniteeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pigniteeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pigniteeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pigniteeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignitegold.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignitegold.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignitegold.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignitegold.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignitegold_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignitegold_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/pignitegold_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pignitegold_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pikachueat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachueat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pikachueat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachueat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pikachueat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachueat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pikachueat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachueat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachufemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachufemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachufemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachufemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachufemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachufemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachufemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachufemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachugigantamaxeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachugigantamaxeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachugigantamaxeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachugigantamaxeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachugigantamaxeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachugigantamaxeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachugigantamaxeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachugigantamaxeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuheadfemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuheadfemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuheadfemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuheadfemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuheadfemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuheadfemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pikachuheadfemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikachuheadfemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipek.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipek.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipek.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipek.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipek_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipek_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipek_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipek_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipekhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipekhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipekhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipekhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipekhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipekhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pikipekhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pikipekhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/piloswine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piloswine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/piloswine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piloswine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/piloswine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piloswine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/piloswine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piloswine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pincurchin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pincurchin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pincurchin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pincurchin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pincurchin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pincurchin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/pincurchin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pincurchin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pineco.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pineco.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pineco.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pineco.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pineco_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pineco_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pineco_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pineco_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/pinsirmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pinsirmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplup.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplupeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplupeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplupeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplupeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplupeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplupeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/piplupeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/piplupeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/plusle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/plusle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/plusle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/plusle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/plusle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/plusle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/plusle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/plusle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pluslehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pluslehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pluslehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pluslehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pluslehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pluslehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/pluslehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pluslehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipole.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipolehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipolehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipolehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipolehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipolehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipolehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poipolehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poipolehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoed.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoedeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoedeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoedeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoedeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoedeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoedeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/politoedeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/politoedeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwag.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwag.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwag.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwag.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwag_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwag_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwag_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwag_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwaghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwaghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwaghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwaghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwaghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwaghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwaghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwaghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirl.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirlhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirlhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirlhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirlhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirlhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirlhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwhirlhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwhirlhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwrath.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwrath.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwrath.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwrath.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwrath_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwrath_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwrath_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwrath_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwratheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwratheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwratheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwratheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwratheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwratheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/poliwratheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poliwratheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageist.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageist.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageist.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageist.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageist_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageist_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageist_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageist_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageisteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageisteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageisteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageisteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageisteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageisteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/polteageisteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/polteageisteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponyta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponyta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytagalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytagalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytagalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytagalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytagalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytagalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytagalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytagalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/ponytahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ponytahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyena.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyenahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyenahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyenahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyenahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyenahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyenahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/poochyenahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poochyenahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplio.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplioeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplioeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplioeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplioeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplioeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplioeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/popplioeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/popplioeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poppliomouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poppliomouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poppliomouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poppliomouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poppliomouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poppliomouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/poppliomouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/poppliomouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon-z.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon-z.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon-z.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon-z.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon-z_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon-z_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon-z_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon-z_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon2eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon2eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygonzeyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygonzeyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygonzeyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygonzeyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygonzeyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygonzeyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/porygonzeyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/porygonzeyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarina.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarina.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarina.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarina_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarina_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinamouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinamouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinamouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinamouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinamouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinamouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/primarinamouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primarinamouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeape.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeape.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeape.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeape.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeape_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeape_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeape_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeape_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeapehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeapehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeapehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeapehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeapehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeapehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/primeapehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/primeapehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplup.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplupeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplupeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplupeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplupeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplupeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplupeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/prinplupeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/prinplupeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopasshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopasshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopasshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopasshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopasshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopasshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/probopasshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/probopasshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduck.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduck.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduck.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduck.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduck_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduck_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduck_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduck_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduckhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduckhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduckhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduckhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduckhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduckhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/psyduckhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/psyduckhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-average.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-average.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-average_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-average_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-large.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-large.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-large.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-large.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-large_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-large_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-large_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-large_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-small.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-small.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-small.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-small.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-small_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-small_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-small_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-small_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-super.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-super.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-super.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-super.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-super_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-super_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pumpkaboo-super_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pumpkaboo-super_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pupitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pupitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pupitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pupitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pupitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pupitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/pupitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pupitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/purrloin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purrloin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/purrloin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purrloin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/purrloin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purrloin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/purrloin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purrloin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/purugly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purugly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/purugly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purugly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/purugly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purugly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/purugly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/purugly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/pyroarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyroarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pyukumuku.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyukumuku.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pyukumuku.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyukumuku.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pyukumuku_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyukumuku_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/pyukumuku_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/pyukumuku_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsirehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsirehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsirehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsirehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsirehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsirehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quagsirehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quagsirehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilava.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilava.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilava.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilava.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilava_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilava_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilava_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilava_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilavaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilavaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilavaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilavaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilavaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilavaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/quilavaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilavaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/quilladin.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilladin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/quilladin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilladin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/quilladin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilladin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/quilladin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/quilladin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfisheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfisheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfisheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfisheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfisheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfisheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfisheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfisheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfishhisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfishhisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfishhisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfishhisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfishhisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfishhisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/qwilfishhisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/qwilfishhisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/raboot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raboot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/raboot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raboot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/raboot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raboot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/raboot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raboot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rabooteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rabooteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rabooteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rabooteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rabooteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rabooteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rabooteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rabooteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichualolahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichualolahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichualolahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichualolahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichualolahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichualolahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichualolahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichualolahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichufemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichufemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichufemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichufemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichufemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichufemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichufemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichufemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuheadfemale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuheadfemale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuheadfemale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuheadfemale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuheadfemale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuheadfemale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raichuheadfemale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raichuheadfemale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikou.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikoueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikoueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikoueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikoueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikoueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikoueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/raikoueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raikoueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ralts.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ralts.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ralts.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ralts.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ralts_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ralts_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/ralts_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ralts_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/raltshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raltshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/raltshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raltshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/raltshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raltshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/raltshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raltshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardoseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardoseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardoseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardoseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardoseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardoseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rampardoseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rampardoseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidasheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidasheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidasheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidasheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidasheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidasheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidasheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidasheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidashgalarianhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidashgalarianhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidashgalarianhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidashgalarianhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidashgalarianhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidashgalarianhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rapidashgalarianhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rapidashgalarianhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolae.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolae.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolae.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolae.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolae_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolae_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolae_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolae_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticatealolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticatealolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticateeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticateeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticateeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticateeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticateeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticateeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/raticateeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/raticateeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattata_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattata_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattataalolahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattataalolahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattataalolahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattataalolahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattataalolahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattataalolahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattataalolahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattataalolahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattatahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattatahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattatahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattatahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattatahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattatahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rattatahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rattatahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquaza_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquaza_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazamegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazamegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazamegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazamegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazamegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazamegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/rayquazamegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rayquazamegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/redcoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/redcoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/redcoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/redcoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/redcoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/redcoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/redcoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/redcoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regiceled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regiceled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regiceled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regiceled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regiceled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regiceled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regiceled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regiceled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidrago.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidrago.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidrago.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidrago.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidrago_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidrago_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidrago_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidrago_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidragoled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidragoled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidragoled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidragoled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidragoled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidragoled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regidragoled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regidragoled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regieleki.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regieleki.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regieleki.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regieleki.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regieleki_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regieleki_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regieleki_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regieleki_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regielekiled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regielekiled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regielekiled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regielekiled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regielekiled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regielekiled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/regielekiled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regielekiled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigas.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigasled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigasled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigasled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigasled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigasled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigasled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/regigigasled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regigigasled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirockled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirockled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirockled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirockled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirockled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirockled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/regirockled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/regirockled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeelled.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeelled.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeelled.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeelled.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeelled_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeelled_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/registeelled_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/registeelled_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/relicanth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/relicanth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/relicanth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/relicanth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/relicanth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/relicanth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/relicanth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/relicanth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraid.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraideye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraideye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraideye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraideye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraideye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraideye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/remoraideye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/remoraideye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reshiram.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reshiram.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reshiram.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reshiram.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reshiram_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reshiram_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reshiram_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reshiram_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reuniclus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reuniclus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reuniclus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reuniclus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reuniclus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reuniclus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/reuniclus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/reuniclus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rfire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rfire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rfire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rfire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rfire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rfire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rfire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rfire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhydoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhydoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorn.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyhorneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyhorneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperioreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperioreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperioreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperioreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperioreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperioreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/rhyperioreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rhyperioreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombeehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombeehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombeehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombeehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombeehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombeehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/ribombeehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ribombeehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboomeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboomeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboomeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboomeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboomeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboomeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rillaboomeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rillaboomeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/riolueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/riolueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruffeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruffeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruffeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruffeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruffeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruffeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rockruffeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rockruffeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/roggenrola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roggenrola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/roggenrola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roggenrola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/roggenrola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roggenrola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/roggenrola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roggenrola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycoly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycoly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycoly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycoly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycoly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycoly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycoly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycoly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycolyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycolyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycolyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycolyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycolyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycolyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rolycolyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rolycolyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookidee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookidee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookidee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookidee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookidee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookidee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookidee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookidee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookideehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookideehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookideehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookideehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookideehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookideehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/rookideehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rookideehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roselia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roselia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roselia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roselia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roselia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roselia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roselia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roselia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roserade.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roserade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roserade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roserade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roserade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roserade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/roserade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/roserade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-fan.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-fan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-fan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-fan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-fan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-fan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-fan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-fan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-frost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-frost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-frost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-frost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-frost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-frost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-frost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-frost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-heat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-heat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-heat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-heat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-heat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-heat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-heat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-heat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-mow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-mow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-mow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-mow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-mow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-mow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-mow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-mow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-wash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-wash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-wash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-wash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-wash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-wash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom-wash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom-wash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfanmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfanmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfanmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfanmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfanmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfanmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfanmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfanmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfrostmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfrostmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfrostmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfrostmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfrostmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfrostmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomfrostmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomfrostmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomheatmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomheatmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomheatmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomheatmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomheatmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomheatmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomheatmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomheatmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotommouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotommouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotommouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotommouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotommouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotommouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotommouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotommouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomwashmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomwashmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomwashmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomwashmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomwashmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomwashmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/rotomwashmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rotomwashmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowlet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowlet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowlet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowlet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowlet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowlet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowlet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowlet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowleteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowleteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowleteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowleteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowleteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowleteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/rowleteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rowleteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflethead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflethead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflethead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflethead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflethead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflethead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/rufflethead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/rufflethead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/runerigus.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/runerigus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/runerigus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/runerigus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/runerigus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/runerigus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/runerigus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/runerigus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sableye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sableye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/salamence_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salamence_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandit.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandithead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandithead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandithead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandithead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandithead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandithead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salandithead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salandithead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/salazzlemark2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/salazzlemark2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotthisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotthisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotthisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotthisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotthisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotthisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/samurotthisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/samurotthisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandaconda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandaconda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondagigantamaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondagigantamaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondagigantamaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondagigantamaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondagigantamaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondagigantamaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondagigantamaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondagigantamaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sandacondahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandacondahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sandileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_alolaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_alolaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_alolaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_alolaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_alolaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_alolaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_alolaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_alolaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandshrew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandshrew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_alola_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_alola_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_alola_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_alola_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_alola_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_alola_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_alola_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_alola_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sandslash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandslash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygast.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygast.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygast.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygast.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygast_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygast_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygast_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygast_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygasthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygasthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygasthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygasthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygasthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygasthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/sandygasthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sandygasthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawkhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawkhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawkhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawkhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawkhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawkhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawkhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawkhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_au.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_au.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_au.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_au.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_au_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_au_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_au_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_au_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_sp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_sp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_sp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_sp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_sp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_sp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_sp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_sp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_su.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_su.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_su.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_su.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_su_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_su_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_su_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_su_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_wi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_wi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_wi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_wi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_wi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_wi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuck_wi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuck_wi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckwieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckwieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckwieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckwieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckwieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckwieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sawsbuckwieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sawsbuckwieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/scale.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/scale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/scale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/scale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/scatterbug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scatterbug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptilemegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptilemegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptilemegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptilemegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptilemegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptilemegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sceptilemegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sceptilemegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizoreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizoreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizoreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizoreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizoreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizoreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizoreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizoreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizormegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizormegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizormegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizormegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizormegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizormegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scizormegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scizormegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipedeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipedeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipedeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipedeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipedeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipedeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scolipedeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scolipedeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnymouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnymouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnymouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnymouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnymouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnymouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/scorbunnymouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scorbunnymouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scrafty.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scrafty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scrafty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scrafty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scrafty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scrafty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scrafty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scrafty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraftyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraftyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraftyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraftyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraftyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraftyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraftyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraftyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/scraggyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scraggyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scyther.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scyther.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scyther.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scyther.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scyther_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scyther_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scyther_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scyther_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scytherhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scytherhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scytherhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scytherhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scytherhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scytherhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/scytherhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/scytherhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadrahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadrahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadrahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadrahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadrahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadrahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seadrahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seadrahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seaking.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seaking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seaking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seaking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seaking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seaking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seaking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seaking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sealeohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sealeohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedoteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedoteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedoteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedoteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedoteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedoteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seedoteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seedoteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/seel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/seismitoad.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seismitoad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/seismitoad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seismitoad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/seismitoad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seismitoad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/seismitoad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seismitoad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentret.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentret.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentret.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentret.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentret_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentret_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentret_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentret_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentrethead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentrethead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentrethead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentrethead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentrethead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentrethead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sentrethead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sentrethead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperiorhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperiorhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperiorhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperiorhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperiorhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperiorhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/serperiorhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/serperiorhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servine.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servineeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servineeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servineeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servineeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servineeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servineeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/servineeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/servineeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviper.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviperhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviperhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviperhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviperhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviperhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviperhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/seviperhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/seviperhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddlehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddlehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddlehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddlehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddlehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddlehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sewaddlehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sewaddlehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedomegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedomegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedomegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedomegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedomegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedomegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sharpedomegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sharpedomegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-land.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-land.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-land.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-land.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-land_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-land_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-land_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-land_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-sky.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-sky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-sky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-sky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-sky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-sky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shaymin-sky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shaymin-sky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminlandhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminlandhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminlandhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminlandhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminlandhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminlandhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminlandhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminlandhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminskyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminskyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminskyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminskyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminskyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminskyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shayminskyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shayminskyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shedinja.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shedinja.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shedinja.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shedinja.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shedinja_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shedinja_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shedinja_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shedinja_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shelgon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelgon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shelgon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelgon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shelgon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelgon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shelgon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelgon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellder.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellder.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellder.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellder.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellder_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellder_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellder_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellder_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellderhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellderhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellderhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellderhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellderhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellderhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/shellderhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellderhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_east.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_east.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_east.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_east.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_east_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_east_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_east_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_east_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_west.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_west.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_west.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_west.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_west_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_west_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shellos_west_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shellos_west_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmethead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmethead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmethead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmethead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmethead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmethead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/shelmethead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shelmethead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shieldoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shieldoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftry.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftry.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftry.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftry.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftry_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftry_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftry_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftry_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftryhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftryhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftryhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftryhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftryhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftryhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shiftryhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiftryhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotichead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotichead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotichead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotichead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotichead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotichead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/shiinotichead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shiinotichead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinx.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinx.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinx.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinx.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/shinxm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shinxm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shroomish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shroomish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shroomish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shroomish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shroomish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shroomish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shroomish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shroomish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/shuckleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuckleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppeteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppeteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppeteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppeteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppeteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppeteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppeteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppeteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppetmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppetmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppetmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppetmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppetmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppetmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/shuppetmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/shuppetmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sigilyph.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sigilyph.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sigilyph.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sigilyph.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sigilyph_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sigilyph_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/sigilyph_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sigilyph_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/silcoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silcoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobrahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobrahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobrahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobrahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobrahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobrahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/silicobrahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silicobrahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvally.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvally.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvally.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvally.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvally_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvally_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvally_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvally_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_bug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_bug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_bug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_bug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_bug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_bug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_bug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_bug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_dragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_dragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_electric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_electric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_electric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_electric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_electric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_electric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_electric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_electric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_flying.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_flying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_flying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_flying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_flying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_flying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_flying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_flying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_grass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_grass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_grass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_grass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_grass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_grass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_grass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_grass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ground.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_poison.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_poison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_poison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_poison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_poison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_poison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_poison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_poison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_psychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_psychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_psychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_psychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_psychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_psychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_psychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_psychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_rock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_rock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_rock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_rock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_rock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_rock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_rock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_rock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_steel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_steel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_steel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_steel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_steel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_steel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_steel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_steel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_water.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_water_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_water_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallyeye_water_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallyeye_water_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_bug.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_bug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_bug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_bug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_bug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_bug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_bug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_bug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_dragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_dragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_electric.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_electric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_electric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_electric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_electric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_electric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_electric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_electric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_flying.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_flying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_flying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_flying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_flying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_flying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_flying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_flying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_grass.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_grass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_grass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_grass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_grass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_grass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_grass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_grass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ground.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_poison.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_poison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_poison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_poison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_poison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_poison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_poison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_poison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_psychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_psychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_psychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_psychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_psychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_psychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_psychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_psychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_rock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_rock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_rock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_rock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_rock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_rock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_rock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_rock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_steel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_steel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_steel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_steel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_steel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_steel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_steel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_steel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_water.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_water_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_water_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/silvallylight_water_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/silvallylight_water_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipour.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipourhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipourhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipourhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipourhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipourhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipourhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simipourhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simipourhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisage.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisage.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisage.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisage.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisage_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisage_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisage_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisage_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisagehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisagehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisagehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisagehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisagehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisagehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisagehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisagehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisear.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisearhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisearhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisearhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisearhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisearhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisearhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/simisearhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/simisearhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinistea.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinistea.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinistea.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinistea.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinistea_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinistea_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinistea_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinistea_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaback.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaback.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaback.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaback.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaback_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaback_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaback_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaback_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sinisteaface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sinisteaface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchd.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchd.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchd.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchd.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchd_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchd_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchd_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchd_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchdhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchdhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchdhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchdhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchdhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchdhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sirfetchdhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sirfetchdhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipedehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipedehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipedehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipedehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipedehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipedehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sizzlipedehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sizzlipedehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmory.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmory.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmory.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmory.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmory_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmory_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmory_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmory_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmoryeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmoryeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmoryeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmoryeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmoryeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmoryeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skarmoryeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skarmoryeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skiddohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiddohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploomeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploomeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploomeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploomeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploomeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploomeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/skiploomeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skiploomeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/skitty.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skitty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/skitty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skitty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/skitty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skitty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/skitty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skitty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skorupi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skorupi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skorupi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skorupi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skorupi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skorupi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skorupi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skorupi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skrelp.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skrelp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skrelp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skrelp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skrelp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skrelp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/skrelp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skrelp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skuntank.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skuntank.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skuntank.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skuntank.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skuntank_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skuntank_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/skuntank_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skuntank_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwovet.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwovet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwovet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwovet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwovet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwovet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwovet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwovet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwoveteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwoveteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwoveteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwoveteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwoveteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwoveteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/skwoveteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/skwoveteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slaking.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slaking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slaking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slaking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slaking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slaking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slaking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slaking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakingeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakingeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakingeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakingeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakingeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakingeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakingeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakingeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/slakoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slakoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggooeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggooeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggooeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggooeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggooeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggooeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggooeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggooeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuimouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuimouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuimouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuimouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuimouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuimouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoohisuimouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoohisuimouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoomouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoomouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoomouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoomouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoomouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoomouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/sliggoomouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sliggoomouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbro_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbro_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarshell.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarshell.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarshell.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarshell.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarshell_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarshell_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrogalarshell_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrogalarshell_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbrohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbrohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbromegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbromegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbromegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbromegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbromegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbromegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowbromegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowbromegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkingeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkingeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkinggalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkinggalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkinggalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkinggalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkinggalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkinggalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowkinggalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowkinggalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpoke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpoke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokegalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokegalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokegalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokegalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokegalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokegalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokegalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokegalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/slowpokehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slowpokehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/slugma.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slugma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/slugma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slugma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/slugma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slugma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/slugma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slugma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuffhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuffhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuffhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuffhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuffhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuffhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/slurpuffhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/slurpuffhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smeargle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smeargle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smeargle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smeargle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smeargle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smeargle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smeargle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smeargle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smearglehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smearglehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smearglehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smearglehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smearglehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smearglehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/smearglehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smearglehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoke.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochum.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochumhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochumhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochumhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochumhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochumhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochumhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/smoochumhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/smoochumhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaseleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaseleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaseleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaseleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaseleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaseleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaseleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaseleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselhisuimouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselhisuimouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaselmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaselmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneasler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneasler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sneaslermouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sneaslermouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/snivyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snivyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snomhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snomhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snomhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snomhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snomhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snomhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/snomhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snomhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgtree.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgtree.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgtree.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgtree.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgtree_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgtree_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxgtree_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxgtree_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/snorlaxhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorlaxhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/snorunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/snorunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/snorunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/snorunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snorunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snover.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snover.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snover.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snover.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snover_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snover_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snover_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snover_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snoverhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snoverhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snoverhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snoverhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snoverhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snoverhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/snoverhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snoverhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbull.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbulleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbulleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbulleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbulleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbulleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbulleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/snubbulleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/snubbulleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobble.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobble.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobble.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobble.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobble_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobble_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobble_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobble_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobbleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobbleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobbleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobbleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobbleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobbleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/sobbleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sobbleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskmask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskmask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskmask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskmask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskmask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskmask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoduskmask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoduskmask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleomask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleomask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleomask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleomask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleomask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleomask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/solgaleomask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solgaleomask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/solosis.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solosis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/solosis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solosis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/solosis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solosis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/solosis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solosis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/solrock.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solrock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/solrock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solrock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/solrock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solrock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/solrock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/solrock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearoweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearoweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearoweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearoweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearoweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearoweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/spearoweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spearoweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/spectrier.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spectrier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/spectrier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spectrier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/spectrier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spectrier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/spectrier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spectrier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_eyes_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_eyes_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_eyes_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_eyes_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spewpa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spewpa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spheal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spheal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spheal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spheal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spheal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spheal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spheal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spheal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sphealhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sphealhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sphealhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sphealhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sphealhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sphealhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/sphealhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sphealhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarak.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/spinarakhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinarakhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_ear.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_ear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_ear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_ear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_ear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_ear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_ear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_ear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_spot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_spot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_spot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_spot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_spot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_spot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spinda_spot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spinda_spot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaearsbase.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaearsbase.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaearsbase.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaearsbase.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaearsbase_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaearsbase_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaearsbase_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaearsbase_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaface.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaface.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaface.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaface.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaface_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaface_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spindaface_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spindaface_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/spiritomb.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spiritomb.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/spiritomb.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spiritomb.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/spiritomb_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spiritomb_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/spiritomb_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spiritomb_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoink.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoinkhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoinkhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoinkhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoinkhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoinkhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoinkhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/spoinkhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spoinkhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzeehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzeehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzeehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzeehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzeehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzeehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/spritzeehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/spritzeehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/squirtleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/squirtleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakataka.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakataka.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakataka.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakataka.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakataka_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakataka_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakataka_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakataka_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakatakahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakatakahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakatakahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakatakahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakatakahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakatakahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stakatakahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stakatakahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantler.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantlerhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantlerhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantlerhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantlerhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantlerhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantlerhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/stantlerhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stantlerhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptor.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptoreye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptoreye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptoreye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptoreye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptoreye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptoreye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraptoreye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraptoreye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staravia.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staravia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staravia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staravia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staravia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staravia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staravia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staravia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraviahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraviahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraviahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraviahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraviahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraviahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/staraviahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staraviahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starly.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starlyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starlyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starlyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starlyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starlyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starlyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/starlyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starlyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/starmie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starmie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/starmie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starmie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/starmie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starmie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/starmie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/starmie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/staryu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staryu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/staryu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staryu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/staryu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staryu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/staryu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/staryu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/steelixmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steelixmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steenee.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steenee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steenee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steenee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steenee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steenee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steenee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steenee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/steeneemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/steeneemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/stone.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/stone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/stone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/stone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjourner.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjourner.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjourner.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjourner.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjourner_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjourner_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjourner_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjourner_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjournereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjournereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjournereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjournereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjournereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjournereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/stonjournereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stonjournereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutland.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutland.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutland.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutland.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutland_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutland_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutland_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutland_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutlandhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutlandhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutlandhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutlandhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutlandhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutlandhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stoutlandhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stoutlandhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stufful.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stufful.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stufful.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stufful.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stufful_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stufful_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stufful_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stufful_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stuffulhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stuffulhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stuffulhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stuffulhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stuffulhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stuffulhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/stuffulhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stuffulhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/stunfisk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunfisk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/stunky.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/stunky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/stunky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/stunky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/stunky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodohead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodohead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodohead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodohead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodohead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodohead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sudowoodohead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sudowoodohead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicune.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicune.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicune.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicune.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicune_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicune_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicune_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicune_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicuneeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicuneeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicuneeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicuneeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicuneeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicuneeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicuneeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicuneeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicunehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicunehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicunehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicunehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicunehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicunehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/suicunehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/suicunehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflora.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflora.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflora.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflora.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflora_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflora_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflora_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflora_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflorahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflorahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflorahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflorahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflorahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflorahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunflorahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunflorahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkern.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkern.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkern.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkern.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkern_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkern_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkern_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkern_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkernhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkernhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkernhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkernhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkernhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkernhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/sunkernhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sunkernhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/surskit.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/surskit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/surskit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/surskit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/surskit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/surskit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/surskit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/surskit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swablu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swablu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swablu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swablu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swablu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swablu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swablu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swablu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swadloonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swadloonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swalot.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swalot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swalot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swalot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swalot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swalot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swalot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swalot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampert_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampert_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swamperteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swamperteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swamperteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swamperteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swamperteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swamperteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swamperteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swamperteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampertmegahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampertmegahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampertmegahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampertmegahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampertmegahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampertmegahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swampertmegahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swampertmegahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swanna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swanna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swanna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swanna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swanna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swanna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swanna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swanna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swannaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swannaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swannaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swannaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swannaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swannaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swannaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swannaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swellow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swellow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swellow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swellow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swellow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swellow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swellow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swellow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swelloweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swelloweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swelloweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swelloweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swelloweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swelloweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/swelloweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swelloweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinub.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinub.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinub.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinub.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinub_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinub_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinub_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinub_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinubeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinubeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinubeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinubeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinubeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinubeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/swinubeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swinubeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/swirlix.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swirlix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/swirlix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swirlix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/swirlix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swirlix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/swirlix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swirlix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swoobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swoobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swoobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swoobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swoobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swoobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/swoobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/swoobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/sylveonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/sylveonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/taillow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/taillow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/taillow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/taillow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/taillow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/taillow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/taillow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/taillow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tailloweye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tailloweye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tailloweye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tailloweye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tailloweye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tailloweye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tailloweye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tailloweye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflame.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflame.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflame.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflame.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflame_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflame_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflame_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflame_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflameeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflameeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflameeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflameeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflameeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflameeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/talonflameeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/talonflameeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangela.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangela.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangela.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangela.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangela_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangela_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangela_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangela_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangelahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangelahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangelahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangelahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangelahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangelahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangelahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangelahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowtheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowtheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowtheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowtheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowtheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowtheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tangrowtheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tangrowtheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-bulu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-bulu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-bulu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-bulu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-bulu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-bulu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-bulu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-bulu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-fini.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-fini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-fini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-fini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-fini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-koko.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-koko.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-koko.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-koko.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-koko_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-koko_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-koko_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-koko_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-lele.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-lele.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-lele.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-lele.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-lele_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-lele_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapu-lele_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapu-lele_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulumark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulumark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulumark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulumark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulumark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulumark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapubulumark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapubulumark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokomark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokomark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokomark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokomark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokomark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokomark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tapukokomark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tapukokomark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauros.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauros.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauros.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauros.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauros_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauros_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauros_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauros_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauroseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauroseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauroseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauroseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauroseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauroseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tauroseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tauroseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursa.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/teddiursahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/teddiursahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacool.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacool.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacool.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacool.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacool_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacool_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacool_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacool_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacoolhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacoolhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacoolhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacoolhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacoolhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacoolhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacoolhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacoolhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruelhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruelhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruelhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruelhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruelhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruelhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tentacruelhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tentacruelhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepig.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepigeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepigeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepigeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepigeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepigeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepigeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tepigeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tepigeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakioneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakioneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakioneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakioneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakioneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakioneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakioneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakioneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakionmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakionmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakionmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakionmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakionmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakionmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/terrakionmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/terrakionmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievul.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievul.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievul.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievul.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievul_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievul_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievul_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievul_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievulhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievulhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievulhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievulhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievulhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievulhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thievulhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thievulhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throh.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throh.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throh.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throh.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throh_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throh_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throh_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throh_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throhhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throhhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throhhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throhhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throhhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throhhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/throhhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/throhhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thunduruseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thunduruseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thunduruseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thunduruseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thunduruseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thunduruseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thunduruseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thunduruseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurusteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurusteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurusteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurusteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurusteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurusteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/thundurusteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thundurusteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackey.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeyeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeyeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeyeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeyeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeyeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeyeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeyeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeyeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeymouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeymouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeymouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeymouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeymouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeymouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/thwackeymouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/thwackeymouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburr.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburrhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburrhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburrhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburrhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburrhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburrhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/timburrhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/timburrhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtouga.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtouga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtouga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtouga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtouga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtouga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtouga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtouga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtougahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtougahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtougahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtougahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtougahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtougahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tirtougahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tirtougahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaru.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaru.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaru.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaru.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaru_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaru_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaru_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaru_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaruhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaruhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaruhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaruhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaruhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaruhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/togedemaruhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togedemaruhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togekiss.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togekiss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togekiss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togekiss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togekiss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togekiss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togekiss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togekiss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepihead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepihead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepihead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepihead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepihead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepihead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togepihead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togepihead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togetic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togetic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togetic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togetic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togetic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togetic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/togetic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/togetic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchic.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchiceye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchiceye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchiceye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchiceye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchiceye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchiceye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torchiceye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torchiceye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torkoal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torkoal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torkoal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torkoal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torkoal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torkoal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/torkoal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torkoal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornaduseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornaduseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornaduseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornaduseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornaduseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornaduseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornaduseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornaduseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadusteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadusteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadusteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadusteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadusteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadusteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tornadusteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tornadusteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracathead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracathead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracathead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracathead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracathead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracathead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/torracathead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torracathead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterrahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterrahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterrahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterrahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterrahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterrahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/torterrahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/torterrahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/totodileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/totodileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toucannonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toucannonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapex.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapexhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapexhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapexhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapexhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapexhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapexhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/toxapexhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxapexhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxelhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxelhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxelhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxelhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxelhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxelhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxelhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxelhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroak.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroakeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroakeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroakeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroakeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroakeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroakeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/toxicroakeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxicroakeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-amped.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-amped.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-amped.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-amped.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-amped_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-amped_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-amped_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-amped_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-low-key.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-low-key.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-low-key.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-low-key.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-low-key_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-low-key_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricity-low-key_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricity-low-key_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricityahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricityahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricityahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricityahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricityahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricityahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricityahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricityahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygigantamax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygigantamax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygigantamax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygigantamax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygigantamax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygigantamax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitygigantamax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitygigantamax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitylhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitylhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitylhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitylhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitylhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitylhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/toxtricitylhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/toxtricitylhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquill.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquilleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquilleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquilleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquilleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquilleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquilleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tranquilleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tranquilleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapinch.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapinch.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapinch.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapinch.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapinch_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapinch_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapinch_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapinch_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapincheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapincheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapincheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapincheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapincheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapincheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/trapincheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trapincheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/treecko_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/treecko_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenanthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenanthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenanthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenanthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenanthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenanthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/trevenanthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trevenanthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropius.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropius.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropius.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropius.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropius_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropius_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropius_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropius_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropiuseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropiuseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropiuseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropiuseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropiuseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropiuseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/tropiuseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tropiuseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbishhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbishhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbishhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbishhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbishhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbishhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/trubbishhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trubbishhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeak.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeakhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeakhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeakhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeakhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeakhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeakhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/trumbeakhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/trumbeakhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareena.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareenaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareenaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareenaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareenaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareenaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareenaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/tsareenaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tsareenaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonator.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonator.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonator.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonator.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonator_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonator_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonator_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonator_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonatorhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonatorhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonatorhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonatorhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonatorhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonatorhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/turtonatorhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtonatorhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_eye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_eye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_eye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_eye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_eye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_eye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_eye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_eye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/turtwig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/turtwig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympole.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympoleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympoleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympoleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympoleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympoleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympoleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympoleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympoleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympolemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympolemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympolemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympolemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympolemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympolemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tympolemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tympolemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamoeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamoeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamoeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamoeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamoeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamoeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamoeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamoeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamomouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamomouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamomouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamomouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamomouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamomouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/tynamomouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tynamomouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/type-null.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/type-null.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/type-null.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/type-null.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/type-null_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/type-null_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/type-null_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/type-null_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/typenulleye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typenulleye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/typenulleye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typenulleye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/typenulleye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typenulleye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/typenulleye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typenulleye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosioneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosioneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosioneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosioneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosioneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosioneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosioneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosioneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosionhisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosionhisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosionhisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosionhisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosionhisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosionhisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/typhlosionhisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/typhlosionhisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarmeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarmeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarmeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarmeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarmeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarmeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/tyranitarmeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyranitarmeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrum.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrumhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrumhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrumhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrumhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrumhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrumhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrantrumhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrantrumhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogue.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogue.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogue.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogue.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogue_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogue_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogue_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogue_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogueeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogueeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogueeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogueeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogueeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogueeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/tyrogueeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrogueeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/tyrunthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/tyrunthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreonmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreonmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreonmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreonmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreonmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreonmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/umbreonmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/umbreonmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantfemaleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantfemaleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantfemaleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantfemaleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantfemaleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantfemaleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantfemaleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantfemaleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantmaleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantmaleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantmaleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantmaleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantmaleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantmaleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/unfezantmaleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unfezantmaleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_a.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_a.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_a.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_a.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_a_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_a_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_a_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_a_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_b.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_b.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_b.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_b.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_b_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_b_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_b_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_b_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_c.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_c.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_c.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_c.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_c_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_c_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_c_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_c_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_d.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_d.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_d.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_d.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_d_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_d_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_d_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_d_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_e.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_e.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_e.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_e.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_e_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_e_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_e_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_e_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_ex.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_ex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_ex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_ex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_ex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_ex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_ex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_ex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_f.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_g.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_g.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_g.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_g.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_g_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_g_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_g_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_g_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_h.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_h.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_h.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_h.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_h_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_h_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_h_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_h_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_i.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_i.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_i.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_i.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_i_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_i_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_i_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_i_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_j.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_j.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_j.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_j.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_j_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_j_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_j_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_j_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_k.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_k.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_k.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_k.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_k_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_k_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_k_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_k_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_l.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_l.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_l.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_l.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_l_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_l_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_l_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_l_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_m.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_n.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_n.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_n.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_n.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_n_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_n_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_n_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_n_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_o.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_p.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_p.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_p.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_p.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_p_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_p_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_p_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_p_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_q.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_q.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_q.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_q.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_q_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_q_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_q_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_q_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_qu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_qu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_qu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_qu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_qu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_qu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_qu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_qu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_r.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_r.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_r.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_r.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_r_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_r_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_r_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_r_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_s_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_s_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_s_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_s_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_t.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_t.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_t.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_t.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_t_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_t_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_t_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_t_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_u.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_u.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_u.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_u.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_u_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_u_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_u_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_u_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_v.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_v.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_v.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_v.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_v_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_v_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_v_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_v_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_w.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_w.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_w.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_w.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_w_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_w_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_w_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_w_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_x.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_y.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_z.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_z.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_z.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_z.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_z_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_z_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/unown_z_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/unown_z_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaluna.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaluna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaluna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaluna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaluna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaluna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaluna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaluna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursalunaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursalunaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursalunaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursalunaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursalunaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursalunaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursalunaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursalunaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaring.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaring.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaring.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaring.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaring_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaring_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaring_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaring_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaringeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaringeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaringeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaringeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaringeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaringeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/ursaringeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/ursaringeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_single.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu-single-strike.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_single.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu-single-strike.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_single_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu-single-strike_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_single_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu-single-strike_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuextra.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuextra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuextra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuextra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuextra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuextra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuextra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuextra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifureye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifureye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifureye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifureye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifureye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifureye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifureye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifureye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifurgigantamax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifurgigantamax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifurgigantamax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifurgigantamax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifurgigantamax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifurgigantamax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifurgigantamax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifurgigantamax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifuseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifuseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifusgigantamax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifusgigantamax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifusgigantamax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifusgigantamax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifusgigantamax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifusgigantamax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/urshifusgigantamax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/urshifusgigantamax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxie.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxieeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxieeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxieeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxieeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxieeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxieeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxieeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxieeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxiemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxiemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxiemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxiemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxiemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxiemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/uxiemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/uxiemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillish.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillite.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanillite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanillite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanilluxe.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanilluxe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanilluxe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanilluxe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanilluxe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanilluxe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vanilluxe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vanilluxe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeoneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeoneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeoneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeoneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeoneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeoneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeoneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeoneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeonmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeonmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeonmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeonmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeonmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeonmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vaporeonmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vaporeonmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/venipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/venipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/venipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/venipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomothhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomothhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomothhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomothhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomothhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomothhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venomothhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venomothhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venonat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venonat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venonat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venonat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venonat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venonat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venonat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venonat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurgeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurgeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurgeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurgeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurgeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurgeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurgeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurgeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurmegaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurmegaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurmegaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurmegaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurmegaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurmegaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/venusaurmegaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/venusaurmegaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/vespiquen.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vespiquen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/vespiquen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vespiquen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/vespiquen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vespiquen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/vespiquen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vespiquen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibrava.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibrava.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibrava.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibrava.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibrava_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibrava_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibrava_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibrava_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibravahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibravahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibravahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibravahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibravahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibravahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vibravahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vibravahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/victini.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/victini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/victini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/victini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebel.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebelhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebelhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebelhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebelhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebelhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebelhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/victreebelhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/victreebelhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigoroth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigoroth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigoroth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigoroth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigoroth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigoroth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigoroth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigoroth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigorotheye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigorotheye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigorotheye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigorotheye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigorotheye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigorotheye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/vigorotheye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vigorotheye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolthead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolthead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolthead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolthead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolthead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolthead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/vikavolthead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vikavolthead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplume.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplume.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplume.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplume.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplume_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplume_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplume_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplume_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplumehead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplumehead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplumehead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplumehead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplumehead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplumehead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vileplumehead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vileplumehead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/violetcoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/violetcoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/violetcoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/violetcoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/violetcoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/violetcoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/violetcoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/violetcoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizioneye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizioneye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizioneye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizioneye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizioneye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizioneye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/virizioneye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/virizioneye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_end.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_end.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_end.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_end.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_eyes.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_eyes.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_eyes.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_eyes.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_hell.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_hell.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_hell.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_hell.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_highplains.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_highplains.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_highplains.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_highplains.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_icesnow.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_icesnow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_icesnow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_icesnow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_modern.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_modern.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_modern.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_modern.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_monsoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_monsoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_monsoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_monsoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_ocean.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_ocean.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_ocean.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_ocean.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_plains.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_plains.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_plains.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_plains.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_polar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_polar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_polar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_polar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_sandstorm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_sandstorm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_sandstorm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_sandstorm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_sun.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_sun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/vivillon_sun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vivillon_sun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/volbeat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volbeat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/volbeat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volbeat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/volbeat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volbeat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/volbeat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volbeat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanion.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanionhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanionhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanionhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanionhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanionhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanionhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/volcanionhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcanionhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcarona.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcarona.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcarona.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcarona.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcarona_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcarona_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcarona_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcarona_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing2.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing3.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/volcaronawing3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/volcaronawing3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_plank.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_plank.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_plank.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_plank.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_plank_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_plank_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_plank_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_plank_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorb_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorb_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorbhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorbhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorbhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorbhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorbhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorbhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/voltorbhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/voltorbhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullaby.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullaby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullaby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullaby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullaby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullaby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullaby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullaby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullabyhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullabyhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullabyhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullabyhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullabyhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullabyhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/vullabyhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vullabyhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/vulpix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/vulpix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmer.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailmereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailmereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailord.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailord.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailord.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailord.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailord_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailord_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wailord_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wailord_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walrein.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walrein.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walrein.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walrein.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walrein_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walrein_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walrein_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walrein_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walreinhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walreinhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walreinhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walreinhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walreinhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walreinhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/walreinhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/walreinhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortleeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortleeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortleeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortleeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortleeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortleeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wartortleeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wartortleeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/watchog.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/watchog.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/watchog.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/watchog.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/watchog_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/watchog_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/watchog_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/watchog_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/water.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavile.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavileeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavileeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavileeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavileeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavileeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavileeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavileeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavileeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavilemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavilemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavilemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavilemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavilemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavilemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/weavilemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weavilemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weedle.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weedle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weedle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weedle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weedle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weedle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weedle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weedle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbell.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbell.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbell.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbell.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbell_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbell_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbell_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbell_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbellhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbellhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbellhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbellhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbellhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbellhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weepinbellhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weepinbellhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhad.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhead1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhead1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhead1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhead1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhead1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhead1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinggalarianhead1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinggalarianhead1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead1.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/weezinghead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/weezinghead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whimsicott.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whimsicott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whimsicott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whimsicott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whimsicott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whimsicott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whimsicott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whimsicott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whirlipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whirlipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whirlipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whirlipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whirlipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whirlipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/whirlipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whirlipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whiscash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whiscash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whiscash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whiscash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whiscash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismur.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismureye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismureye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismureye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismureye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismureye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismureye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/whismureye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/whismureye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffmouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffmouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffmouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffmouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffmouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffmouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/wigglytuffmouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wigglytuffmouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpod.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpodhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpodhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpodhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpodhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpodhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpodhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wimpodhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wimpodhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingull.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingullhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingullhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingullhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingullhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingullhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingullhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wingullhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wingullhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi-school.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-school.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi-school.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-school.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi-school_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-school_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi-school_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-school_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-solo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-solo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-solo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/wishiwashi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wishiwashi-solo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadf.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetheadm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetheadm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetm.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetm.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetm.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetm.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetm_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetm_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wobbuffetm_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wobbuffetm_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/woobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/woobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/woobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/woobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloo.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/woolooeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woolooeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/woolooeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woolooeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/woolooeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woolooeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/woolooeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/woolooeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/wooloom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooloom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooper.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooperhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooperhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooperhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooperhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooperhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooperhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wooperhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wooperhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-plant.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-plant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-plant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-plant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-plant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-plant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-plant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-plant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-sandy.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-sandy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-sandy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-sandy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-sandy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-sandy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-sandy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-sandy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-trash.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-trash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-trash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-trash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-trash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-trash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadam-trash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadam-trash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadameye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadameye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadameye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadameye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadameye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadameye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity/textures/wormadameye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wormadameye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wurmple.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wurmple.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wurmple.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wurmple.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wurmple_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wurmple_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/wurmple_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wurmple_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynaut.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynaut.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynaut.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynaut.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynaut_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynaut_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynaut_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynaut_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynauteye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynauteye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynauteye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynauteye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynauteye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynauteye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wynauteye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wynauteye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeer.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeereye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeereye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeereye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeereye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeereye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeereye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/wyrdeereye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/wyrdeereye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatu.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatuhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatuhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatuhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatuhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatuhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatuhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/xatuhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xatuhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneas.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneaseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneaseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneaseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneaseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneaseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneaseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/xerneaseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xerneaseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/xurkitree.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xurkitree.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/xurkitree.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xurkitree.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/xurkitree_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xurkitree_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/xurkitree_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/xurkitree_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskgalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskgalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskgalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskgalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskgalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskgalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskgalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskgalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/yamaskhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamaskhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamper.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamperhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamperhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamperhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamperhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamperhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamperhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/yamperhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yamperhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanma.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmahead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmahead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmahead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmahead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmahead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmahead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmahead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmahead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmega.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity/textures/yanmega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yanmega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yellowcoreminior.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yellowcoreminior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yellowcoreminior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yellowcoreminior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yellowcoreminior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yellowcoreminior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yellowcoreminior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yellowcoreminior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungoos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungoos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungoos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungoos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungoos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungoos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungoos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungoos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungooshead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungooshead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungooshead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungooshead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungooshead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungooshead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/yungooshead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yungooshead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltal.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltalhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltalhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltalhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltalhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltalhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltalhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/yveltalhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/yveltalhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian-crowned.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian-crowned.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian-crowned.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian-crowned.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian-crowned_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian-crowned_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian-crowned_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian-crowned_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacianeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacianeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacianeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacianeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacianeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacianeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zacianeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zacianeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta-crowned.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta-crowned.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta-crowned.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta-crowned.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta-crowned_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta-crowned_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta-crowned_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta-crowned_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazenta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazenta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazentaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazentaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazentaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazentaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazentaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazentaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zamazentaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zamazentaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoose.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoose.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoose.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoose.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoose_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoose_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoose_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoose_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangooseeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangooseeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangooseeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangooseeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangooseeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangooseeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangooseeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangooseeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoosemouth.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoosemouth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoosemouth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoosemouth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoosemouth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoosemouth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zangoosemouth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zangoosemouth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdoseye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdoseye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdoseye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdoseye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdoseye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdoseye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdoseye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdoseye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdosgalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdosgalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdosgalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdosgalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdosgalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdosgalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zapdosgalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zapdosgalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarude.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarude.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarude.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarude.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarude_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarude_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarude_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarude_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarudeeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarudeeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarudeeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarudeeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarudeeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarudeeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity/textures/zarudeeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zarudeeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zebstrika.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zebstrika.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zebstrika.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zebstrika.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zebstrika_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zebstrika_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zebstrika_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zebstrika_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekrom.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekrom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekrom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekrom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekrom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekrom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekrom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekrom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekromeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekromeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekromeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekromeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekromeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekromeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zekromeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zekromeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraora.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraora.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraora.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraora.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraora_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraora_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraora_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraora_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraoraeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraoraeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraoraeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraoraeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraoraeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraoraeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity/textures/zeraoraeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zeraoraeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoongalarhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoongalarhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoongalarhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoongalarhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoongalarhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoongalarhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoongalarhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoongalarhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoonhead.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoonhead.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoonhead.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoonhead.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoonhead_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoonhead_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity/textures/zigzagoonhead_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zigzagoonhead_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_hisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_hisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_hisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_hisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_hisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_hisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_hisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_hisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroarkeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroarkeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroarkeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroarkeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroarkeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroarkeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoroarkeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoroarkeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_hisuieye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_hisuieye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_hisuieye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_hisuieye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_hisuieye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_hisuieye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_hisuieye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_hisuieye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zorua_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zorua_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoruaeye.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoruaeye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoruaeye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoruaeye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoruaeye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoruaeye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zoruaeye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zoruaeye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zubat.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zubat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zubat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zubat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zubat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zubat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity/textures/zubat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zubat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zweilous.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zweilous.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zweilous.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zweilous.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zweilous_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zweilous_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity/textures/zweilous_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zweilous_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-10.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-10.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-10.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-10.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-10_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-10_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-10_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-10_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-50.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-50.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-50.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-50.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-50_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-50_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde-50_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-50_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde_100.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-complete.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde_100.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-complete.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde_100_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-complete_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde_100_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde-complete_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde100head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde100head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde100head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde100head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde100head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde100head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde100head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde100head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde50head.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde50head.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde50head.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde50head.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde50head_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde50head_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity/textures/zygarde50head_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity/pokemob/zygarde50head_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/abomasnow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abomasnow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/abra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/abra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/abra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/abra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/abra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/absol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/absol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/accelgor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/accelgor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/accelgor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/accelgor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/accelgor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/accelgor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/accelgor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/accelgor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-blade.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-blade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-blade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-blade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-blade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-blade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-blade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-blade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-shield.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-shield.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-shield.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-shield.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-shield_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-shield_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aegislash-shield_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aegislash-shield_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/aerodactyl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aerodactyl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aggron_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aggron_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/aipom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aipom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/aipom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aipom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/aipom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aipom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/aipom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aipom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/alakazam_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alakazam_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_caramel_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_caramel_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_lemon_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_lemon_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_matcha_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_matcha_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_mint_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_mint_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_rainbow_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_rainbow_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_ruby_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_ruby_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_salted_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_salted_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_swirl_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_swirl_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_1.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_1.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_1.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_1.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_1_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_1_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_1_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_1_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_3.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_3.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_3.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_3.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_3_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_3_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_3_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_3_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_4.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_4.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_4.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_4.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_4_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_4_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_4_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_4_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_5.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_5.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_5.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_5.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_5_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_5_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_5_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_5_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_6.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_6.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_6.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_6.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_6_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_6_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_6_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_6_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_7.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_7.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_7.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_7.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_7_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_7_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/alcremie_vanilla_7_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alcremie_vanilla_7_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/alomomola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alomomola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/alomomola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alomomola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/alomomola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alomomola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/alomomola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/alomomola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/altaria_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/altaria_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/amaura.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amaura.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/amaura.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amaura.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/amaura_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amaura_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/amaura_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amaura_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ambipom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ambipom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ambipom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ambipom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ambipom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ambipom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ambipom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ambipom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/amoonguss.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amoonguss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/amoonguss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amoonguss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/amoonguss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amoonguss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/amoonguss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/amoonguss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ampharos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ampharos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/anorith.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/anorith.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/anorith.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/anorith.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/anorith_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/anorith_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/anorith_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/anorith_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/appletun_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/appletun_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/applin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/applin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/applin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/applin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/applin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/applin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/applin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/applin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/araquanid.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/araquanid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/araquanid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/araquanid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/araquanid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/araquanid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/araquanid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/araquanid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arbok.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arbok.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arbok.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arbok.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arbok_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arbok_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arbok_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arbok_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/arcanine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arcanine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_bug.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_bug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_bug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_bug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_bug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_bug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_bug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_bug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dark.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_dragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_dragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_electric.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_electric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_electric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_electric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_electric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_electric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_electric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_electric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_flying.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_flying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_flying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_flying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_flying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_flying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_flying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_flying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_grass.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_grass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_grass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_grass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_grass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_grass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_grass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_grass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ground.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_poison.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_poison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_poison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_poison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_poison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_poison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_poison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_poison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_psychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_psychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_psychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_psychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_psychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_psychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_psychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_psychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_rock.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_rock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_rock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_rock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_rock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_rock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_rock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_rock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_steel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_steel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_steel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_steel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_steel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_steel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_steel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_steel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_water.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_water_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_water_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/arceus_water_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arceus_water_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archeops.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archeops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archeops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archeops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archeops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archeops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/archeops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/archeops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctovish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctovish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctovish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctovish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctovish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctovish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctovish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctovish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctozolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctozolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctozolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctozolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctozolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctozolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arctozolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arctozolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ariados.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ariados.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ariados.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ariados.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ariados_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ariados_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ariados_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ariados_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/armaldo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/armaldo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/armaldo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/armaldo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/armaldo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/armaldo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/armaldo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/armaldo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aromatisse.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aromatisse.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aromatisse.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aromatisse.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aromatisse_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aromatisse_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aromatisse_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aromatisse_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aron.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aron.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aron.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aron.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aron_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aron_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/aron_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aron_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arrokuda.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arrokuda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arrokuda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arrokuda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arrokuda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arrokuda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/arrokuda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/arrokuda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/articuno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/articuno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/audino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/audino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aurorus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aurorus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aurorus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aurorus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aurorus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aurorus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/aurorus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/aurorus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/avalugg_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/avalugg_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/axew.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/axew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/axew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/axew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/axew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/axew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/axew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/axew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/azelf.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azelf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/azelf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azelf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/azelf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azelf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/azelf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azelf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azumarill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azumarill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azumarill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azumarill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azumarill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azumarill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azumarill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azumarill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azurill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azurill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azurill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azurill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azurill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azurill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/azurill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/azurill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/bagon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bagon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/bagon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bagon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/bagon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bagon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/bagon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bagon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/baltoy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/baltoy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/baltoy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/baltoy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/baltoy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/baltoy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/baltoy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/baltoy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/banette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/banette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/barbaracle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barbaracle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/barbaracle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barbaracle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/barbaracle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barbaracle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/barbaracle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barbaracle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/barboach.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barboach.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/barboach.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barboach.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/barboach_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barboach_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/barboach_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barboach_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/barraskewda.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barraskewda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/barraskewda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barraskewda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/barraskewda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barraskewda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/barraskewda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/barraskewda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculegion-male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculegion-male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin-white-striped.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin-white-striped.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin-white-striped_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin-white-striped_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_blue_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_blue_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/basculin_red_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/basculin_red_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bastiodon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bastiodon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bastiodon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bastiodon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bastiodon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bastiodon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bastiodon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bastiodon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bayleef.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bayleef.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bayleef.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bayleef.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bayleef_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bayleef_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bayleef_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bayleef_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beartic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beartic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beartic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beartic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beartic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beartic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beartic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beartic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beautifly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beautifly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beautifly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beautifly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beautifly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beautifly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beautifly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beautifly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/beedrill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beedrill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beheeyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beheeyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beheeyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beheeyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beheeyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beheeyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/beheeyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beheeyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beldum.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beldum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beldum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beldum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beldum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beldum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/beldum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/beldum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellossom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellossom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellossom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellossom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellossom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellossom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellossom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellossom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellsprout.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellsprout.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellsprout.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellsprout.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellsprout_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellsprout_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bellsprout_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bellsprout_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bergmite.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bergmite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bergmite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bergmite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bergmite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bergmite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bergmite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bergmite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bewear.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bewear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bewear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bewear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bewear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bewear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bewear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bewear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bibarel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bibarel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bibarel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bibarel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bibarel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bibarel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bibarel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bibarel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bidoof.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bidoof.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bidoof.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bidoof.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bidoof_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bidoof_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bidoof_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bidoof_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/binacle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/binacle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/binacle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/binacle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/binacle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/binacle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/binacle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/binacle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bisharp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bisharp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bisharp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bisharp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bisharp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bisharp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bisharp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bisharp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/blacephalon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blacephalon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/blacephalon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blacephalon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/blacephalon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blacephalon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/blacephalon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blacephalon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blastoise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blastoise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/blaziken_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blaziken_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/blipbug.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blipbug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/blipbug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blipbug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/blipbug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blipbug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/blipbug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blipbug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blissey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blissey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blissey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blissey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blissey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blissey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/blissey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blissey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/blitzle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blitzle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/blitzle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blitzle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/blitzle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blitzle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/blitzle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/blitzle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/boldore.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boldore.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/boldore.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boldore.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/boldore_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boldore_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/boldore_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boldore_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/boltund.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boltund.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/boltund.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boltund.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/boltund_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boltund_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/boltund_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/boltund_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bonsly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bonsly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bonsly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bonsly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bonsly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bonsly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/bonsly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bonsly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bouffalant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bouffalant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bouffalant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bouffalant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bouffalant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bouffalant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/bouffalant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bouffalant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bounsweet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bounsweet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bounsweet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bounsweet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bounsweet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bounsweet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bounsweet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bounsweet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/braixen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braixen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/braixen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braixen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/braixen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braixen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/braixen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braixen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/braviary_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/braviary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/breloom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/breloom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/breloom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/breloom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/breloom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/breloom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/breloom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/breloom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/brionne.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/brionne.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/brionne.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/brionne.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/brionne_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/brionne_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/brionne_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/brionne_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzong.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzong.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzong.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzong.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzong_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzong_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzong_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzong_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/bronzor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bronzor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bruxish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bruxish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bruxish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bruxish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bruxish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bruxish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/bruxish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bruxish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/budew.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/budew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/budew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/budew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/budew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/budew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/budew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/budew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buizel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buizel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buizel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buizel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buizel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buizel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buizel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buizel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bulbasaur.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bulbasaur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bulbasaur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bulbasaur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bulbasaur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bulbasaur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/bulbasaur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bulbasaur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buneary.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buneary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buneary.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buneary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buneary_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buneary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/buneary_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buneary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bunnelby.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bunnelby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bunnelby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bunnelby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bunnelby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bunnelby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/bunnelby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/bunnelby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/burmy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/burmy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/burmy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/burmy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/burmy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/burmy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/burmy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/burmy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/butterfree_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/butterfree_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/buzzwole.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buzzwole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/buzzwole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buzzwole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/buzzwole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buzzwole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/buzzwole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/buzzwole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacnea.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacnea.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacnea.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacnea.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacnea_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacnea_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacnea_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacnea_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cacturne_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cacturne_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-shadow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-shadow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-shadow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-shadow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-shadow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-shadow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex-shadow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex-shadow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/calyrex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/calyrex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/camerupt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/camerupt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/carbink.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carbink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/carbink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carbink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/carbink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carbink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/carbink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carbink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/carkol.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carkol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/carkol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carkol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/carkol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carkol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/carkol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carkol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/carnivine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carnivine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/carnivine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carnivine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/carnivine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carnivine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/carnivine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carnivine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/carracosta.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carracosta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/carracosta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carracosta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/carracosta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carracosta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/carracosta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carracosta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/carvanha.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carvanha.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/carvanha.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carvanha.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/carvanha_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carvanha_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/carvanha_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/carvanha_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cascoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cascoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cascoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cascoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cascoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cascoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cascoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cascoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-rainy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-rainy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-rainy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-rainy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-rainy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-rainy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-rainy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-rainy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-snowy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-snowy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-snowy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-snowy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-snowy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-snowy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-snowy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-snowy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-sunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-sunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-sunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-sunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-sunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-sunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform-sunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform-sunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/castform_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/castform_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/caterpie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/caterpie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/caterpie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/caterpie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/caterpie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/caterpie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/caterpie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/caterpie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/celebi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celebi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/celebi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celebi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/celebi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celebi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/celebi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celebi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/celesteela.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celesteela.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/celesteela.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celesteela.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/celesteela_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celesteela_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/celesteela_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/celesteela_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/centiskorch_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/centiskorch_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/chandelure.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chandelure.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/chandelure.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chandelure.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/chandelure_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chandelure_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/chandelure_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chandelure_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/chansey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chansey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/chansey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chansey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/chansey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chansey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/chansey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chansey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-x.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-y.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard-mega-y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard-mega-y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charizard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charizard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/charjabug.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charjabug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/charjabug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charjabug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/charjabug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charjabug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/charjabug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charjabug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmander.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmander.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmander.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmander.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmander_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmander_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmander_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmander_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmeleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmeleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmeleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmeleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmeleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmeleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/charmeleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/charmeleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chatot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chatot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chatot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chatot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chatot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chatot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chatot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chatot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_sunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherrim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_sunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherrim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_sunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherrim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherrim_sunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherrim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherubi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherubi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherubi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherubi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherubi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherubi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cherubi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cherubi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chesnaught.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chesnaught.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chesnaught.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chesnaught.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chesnaught_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chesnaught_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chesnaught_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chesnaught_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chespin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chespin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chespin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chespin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chespin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chespin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/chespin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chespin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/chewtle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chewtle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/chewtle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chewtle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/chewtle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chewtle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/chewtle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chewtle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chikorita.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chikorita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chikorita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chikorita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chikorita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chikorita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chikorita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chikorita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chimchar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimchar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chimchar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimchar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chimchar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimchar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/chimchar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimchar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chimecho.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimecho.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chimecho.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimecho.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chimecho_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimecho_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chimecho_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chimecho_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chinchou.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chinchou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chinchou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chinchou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chinchou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chinchou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/chinchou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chinchou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chingling.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chingling.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chingling.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chingling.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chingling_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chingling_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/chingling_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/chingling_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cinccino.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinccino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cinccino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinccino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cinccino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinccino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cinccino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinccino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cinderace_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cinderace_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/clamperl.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clamperl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/clamperl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clamperl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/clamperl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clamperl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/clamperl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clamperl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clauncher.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clauncher.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clauncher.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clauncher.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clauncher_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clauncher_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clauncher_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clauncher_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clawitzer.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clawitzer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clawitzer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clawitzer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clawitzer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clawitzer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/clawitzer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clawitzer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/claydol.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/claydol.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/claydol.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/claydol.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/claydol_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/claydol_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/claydol_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/claydol_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefable.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefable.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefable.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefable.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefable_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefable_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefable_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefable_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/clefairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clefairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cleffa.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cleffa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cleffa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cleffa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cleffa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cleffa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cleffa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cleffa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/clobbopus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clobbopus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/clobbopus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clobbopus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/clobbopus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clobbopus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/clobbopus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/clobbopus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cloyster.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cloyster.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cloyster.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cloyster.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cloyster_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cloyster_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cloyster_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cloyster_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/coalossal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/coalossal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cobalion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cobalion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cobalion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cobalion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cobalion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cobalion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cobalion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cobalion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cofagrigus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cofagrigus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cofagrigus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cofagrigus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cofagrigus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cofagrigus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cofagrigus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cofagrigus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/combee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/combusken_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/combusken_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/comfey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/comfey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/comfey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/comfey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/comfey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/comfey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/comfey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/comfey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/conkeldurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/conkeldurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/conkeldurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/conkeldurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/conkeldurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/conkeldurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/conkeldurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/conkeldurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/copperajah_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/copperajah_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/corphish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corphish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/corphish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corphish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/corphish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corphish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/corphish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corphish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/corsola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corsola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corviknight_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corviknight_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corvisquire.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corvisquire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corvisquire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corvisquire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corvisquire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corvisquire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/corvisquire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/corvisquire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmoem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmoem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmoem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmoem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmoem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmoem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmoem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmoem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmog.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmog.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmog.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmog.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmog_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmog_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cosmog_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cosmog_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cottonee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cottonee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cottonee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cottonee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cottonee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cottonee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cottonee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cottonee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabominable.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabominable.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabominable.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabominable.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabominable_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabominable_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabominable_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabominable_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabrawler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabrawler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabrawler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabrawler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabrawler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabrawler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/crabrawler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crabrawler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cradily.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cradily.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cradily.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cradily.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cradily_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cradily_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/cradily_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cradily_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gorging.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gorging.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gorging.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gorging.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gorging_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gorging_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gorging_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gorging_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gulping.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gulping.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gulping.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gulping.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gulping_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gulping_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant-gulping_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant-gulping_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cramorant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cramorant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cranidos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cranidos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cranidos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cranidos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cranidos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cranidos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cranidos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cranidos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/crawdaunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crawdaunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/crawdaunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crawdaunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/crawdaunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crawdaunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/crawdaunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crawdaunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cresselia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cresselia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cresselia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cresselia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cresselia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cresselia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/cresselia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cresselia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/croagunk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croagunk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/croagunk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croagunk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/croagunk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croagunk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/croagunk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croagunk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/crobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/crobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/crobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/crobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/croconaw.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croconaw.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/croconaw.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croconaw.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/croconaw_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croconaw_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/croconaw_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/croconaw_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/crustle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crustle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/crustle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crustle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/crustle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crustle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/crustle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/crustle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cryogonal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cryogonal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cryogonal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cryogonal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cryogonal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cryogonal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cryogonal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cryogonal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cubchoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubchoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cubchoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubchoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cubchoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubchoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/cubchoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubchoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cubone.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cubone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cubone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/cubone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cubone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cufant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cufant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cufant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cufant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cufant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cufant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/cufant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cufant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cursola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cursola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cursola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cursola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cursola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cursola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cursola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cursola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cutiefly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cutiefly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cutiefly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cutiefly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cutiefly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cutiefly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/cutiefly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cutiefly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cyndaquil.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cyndaquil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cyndaquil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cyndaquil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cyndaquil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cyndaquil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/cyndaquil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/cyndaquil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/darkrai.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darkrai.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/darkrai.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darkrai.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/darkrai_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darkrai_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/darkrai_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darkrai_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-standard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-standard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-standard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-standard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_zen_galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-zen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_zen_galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-zen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_zen_galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-zen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_zen_galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-galar-zen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-standard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-standard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-standard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-standard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan-zen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-zen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan-zen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-zen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan-zen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-zen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darmanitan-zen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darmanitan-zen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dartrix.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dartrix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dartrix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dartrix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dartrix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dartrix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dartrix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dartrix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/darumaka_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/darumaka_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/decidueye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/decidueye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dedenne.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dedenne.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dedenne.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dedenne.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dedenne_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dedenne_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dedenne_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dedenne_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_au_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_au_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_sp_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_sp_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_su_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_su_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deerling_wi_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deerling_wi_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deino.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/deino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/delcatty.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delcatty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/delcatty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delcatty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/delcatty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delcatty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/delcatty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delcatty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/delibird.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delibird.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/delibird.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delibird.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/delibird_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delibird_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/delibird_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delibird_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/delphox.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delphox.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/delphox.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delphox.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/delphox_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delphox_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/delphox_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/delphox_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-attack.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-attack.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-attack.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-attack.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-attack_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-attack_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-attack_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-attack_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-defense.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-defense.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-defense.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-defense.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-defense_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-defense_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-defense_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-defense_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-normal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-normal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-normal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-normal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-speed.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-speed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-speed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-speed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-speed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-speed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/deoxys-speed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/deoxys-speed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dewgong.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewgong.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dewgong.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewgong.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dewgong_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewgong_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dewgong_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewgong_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dewott.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dewott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dewott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dewott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dewpider.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewpider.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dewpider.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewpider.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dewpider_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewpider_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dewpider_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dewpider_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dhelmise.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dhelmise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dhelmise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dhelmise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dhelmise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dhelmise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/dhelmise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dhelmise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga-origin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga-origin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga-origin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga-origin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga-origin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga-origin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga-origin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga-origin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/dialga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dialga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diancie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diancie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diggersby.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diggersby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diggersby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diggersby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diggersby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diggersby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/diggersby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diggersby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/diglett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/diglett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ditto.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ditto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ditto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ditto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ditto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ditto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ditto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ditto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dodrio.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dodrio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dodrio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dodrio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dodrio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dodrio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dodrio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dodrio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/doduo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doduo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/donphan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/donphan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/donphan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/donphan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/donphan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/donphan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/donphan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/donphan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dottler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dottler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dottler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dottler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dottler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dottler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dottler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dottler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/doublade.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doublade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/doublade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doublade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/doublade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doublade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/doublade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/doublade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracovish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracovish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracovish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracovish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracovish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracovish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracovish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracovish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracozolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracozolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracozolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracozolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracozolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracozolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dracozolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dracozolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dragalge.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragalge.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dragalge.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragalge.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dragalge_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragalge_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/dragalge_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragalge_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dragapult.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragapult.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dragapult.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragapult.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dragapult_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragapult_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dragapult_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragapult_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonair.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonair.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonair.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonair.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonair_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonair_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonair_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonair_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonite.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dragonite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dragonite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drakloak.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drakloak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drakloak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drakloak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drakloak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drakloak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drakloak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drakloak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/drampa.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drampa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/drampa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drampa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/drampa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drampa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/drampa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drampa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drapion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drapion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drapion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drapion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drapion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drapion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drapion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drapion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dratini.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dratini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dratini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dratini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dratini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dratini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dratini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dratini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drednaw_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drednaw_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dreepy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dreepy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dreepy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dreepy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dreepy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dreepy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dreepy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dreepy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifblim.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifblim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifblim.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifblim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifblim_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifblim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifblim_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifblim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifloon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifloon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifloon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifloon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifloon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifloon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/drifloon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drifloon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/drilbur.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drilbur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/drilbur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drilbur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/drilbur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drilbur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/drilbur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drilbur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drizzile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drizzile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drizzile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drizzile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drizzile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drizzile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/drizzile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drizzile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/drowzee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drowzee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/drowzee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drowzee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/drowzee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drowzee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/drowzee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/drowzee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/druddigon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/druddigon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/druddigon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/druddigon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/druddigon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/druddigon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/druddigon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/druddigon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dubwool.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dubwool.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dubwool.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dubwool.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dubwool_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dubwool_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/dubwool_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dubwool_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ducklett.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ducklett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ducklett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ducklett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ducklett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ducklett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ducklett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ducklett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/dugtrio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dugtrio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/dunsparce.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dunsparce.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/dunsparce.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dunsparce.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/dunsparce_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dunsparce_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/dunsparce_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dunsparce_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/duosion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duosion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/duosion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duosion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/duosion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duosion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/duosion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duosion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/duraludon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duraludon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/durant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/durant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/durant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/durant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/durant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/durant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/durant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/durant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusclops.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusclops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusclops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusclops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusclops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusclops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusclops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusclops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusknoir.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusknoir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusknoir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusknoir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusknoir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusknoir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dusknoir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dusknoir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/duskull.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duskull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/duskull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duskull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/duskull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duskull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/duskull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/duskull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dustox.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dustox.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dustox.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dustox.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dustox_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dustox_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/dustox_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dustox_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dwebble.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dwebble.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dwebble.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dwebble.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dwebble_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dwebble_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/dwebble_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/dwebble_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektrik.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektrik.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektrik.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektrik.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektrik_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektrik_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektrik_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektrik_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektross.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektross.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektross.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektross.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektross_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektross_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/eelektross_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eelektross_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_gigantamax_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_gigantamax_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_gigantamax_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_gigantamax_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_gigantamax_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_gigantamax_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_gigantamax_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_gigantamax_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/eevee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eevee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue-noice.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-noice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue-noice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-noice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue-noice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-noice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eiscue-noice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eiscue-noice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ekans.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ekans.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ekans.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ekans.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ekans_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ekans_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ekans_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ekans_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eldegoss.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eldegoss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eldegoss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eldegoss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eldegoss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eldegoss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eldegoss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eldegoss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electabuzz.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electabuzz.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electabuzz.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electabuzz.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electabuzz_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electabuzz_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electabuzz_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electabuzz_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electivire.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electivire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electivire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electivire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electivire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electivire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electivire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electivire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/electrike.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrike.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/electrike.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrike.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/electrike_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrike_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/electrike_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrike_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/electrode_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/electrode_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/elekid.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elekid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/elekid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elekid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/elekid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elekid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/elekid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elekid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/elgyem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elgyem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/elgyem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elgyem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/elgyem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elgyem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/elgyem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/elgyem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emboar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emboar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emboar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emboar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emboar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emboar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emboar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emboar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emolga.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emolga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emolga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emolga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emolga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emolga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/emolga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/emolga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/empoleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/empoleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/empoleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/empoleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/empoleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/empoleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/empoleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/empoleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/enamorus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/enamorus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/entei.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/entei.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/entei.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/entei.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/entei_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/entei_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/entei_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/entei_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/escavalier.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/escavalier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/escavalier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/escavalier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/escavalier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/escavalier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/escavalier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/escavalier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/espeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/espeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/espeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/espeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/espurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/espurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/espurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/espurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/espurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_gigantamax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus-eternamax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_gigantamax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus-eternamax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_gigantamax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus-eternamax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_gigantamax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus-eternamax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/eternatus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/eternatus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/excadrill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/excadrill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/excadrill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/excadrill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/excadrill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/excadrill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/excadrill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/excadrill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggcute.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggcute.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggcute.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggcute.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggcute_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggcute_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggcute_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggcute_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/exeggutor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exeggutor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/exploud.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exploud.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/exploud.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exploud.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/exploud_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exploud_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/exploud_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/exploud_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/falinks.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/falinks.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/falinks.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/falinks.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/falinks_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/falinks_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/falinks_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/falinks_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/farfetchd_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/farfetchd_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/fearow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fearow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/fearow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fearow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/fearow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fearow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/fearow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fearow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/feebas.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feebas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/feebas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feebas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/feebas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feebas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/feebas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feebas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fennekin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fennekin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fennekin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fennekin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fennekin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fennekin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fennekin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fennekin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/feraligatr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feraligatr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/feraligatr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feraligatr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/feraligatr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feraligatr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/feraligatr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/feraligatr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferroseed.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferroseed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferroseed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferroseed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferroseed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferroseed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferroseed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferroseed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferrothorn.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferrothorn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferrothorn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferrothorn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferrothorn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferrothorn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/ferrothorn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ferrothorn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/finneon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/finneon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/finneon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/finneon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/finneon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/finneon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/finneon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/finneon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/flaaffy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flaaffy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/flaaffy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flaaffy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/flaaffy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flaaffy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/flaaffy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flaaffy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/flabebe.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flabebe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/flabebe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flabebe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/flabebe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flabebe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/flabebe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flabebe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/flapple_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flapple_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/flareon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flareon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/flareon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flareon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/flareon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flareon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/flareon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flareon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchinder.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchinder.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchinder.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchinder.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchinder_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchinder_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchinder_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchinder_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchling.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchling.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchling.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchling.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchling_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchling_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/fletchling_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fletchling_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/floatzel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floatzel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette-eternal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette-eternal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette-eternal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette-eternal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette-eternal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette-eternal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette-eternal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette-eternal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/floette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/floette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/florges.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/florges.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/florges.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/florges.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/florges_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/florges_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/florges_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/florges_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/flygon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flygon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/flygon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flygon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/flygon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flygon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/flygon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/flygon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/fomantis.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fomantis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/fomantis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fomantis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/fomantis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fomantis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/fomantis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fomantis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/foongus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/foongus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/foongus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/foongus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/foongus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/foongus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/foongus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/foongus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/forretress.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/forretress.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/forretress.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/forretress.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/forretress_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/forretress_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/forretress_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/forretress_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/fraxure.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fraxure.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/fraxure.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fraxure.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/fraxure_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fraxure_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/fraxure_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/fraxure_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/frillish_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frillish_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/froakie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froakie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/froakie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froakie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/froakie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froakie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/froakie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froakie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/frogadier.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frogadier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/frogadier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frogadier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/frogadier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frogadier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/frogadier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frogadier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/froslass.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froslass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/froslass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froslass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/froslass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froslass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/froslass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/froslass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/frosmoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frosmoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/frosmoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frosmoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/frosmoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frosmoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/frosmoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/frosmoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/furfrou.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furfrou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/furfrou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furfrou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/furfrou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furfrou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/furfrou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furfrou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/furret.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furret.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/furret.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furret.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/furret_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furret_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/furret_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/furret_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gabite_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gabite_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gallade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gallade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/galvantula.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/galvantula.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/galvantula.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/galvantula.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/galvantula_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/galvantula_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/galvantula_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/galvantula_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/garbodor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garbodor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/garchomp_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/garchomp_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gardevoir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gardevoir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gastly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gastly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gastly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gastly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_east_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_east_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gastrodon_west_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gastrodon_west_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectsdrive.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/genesect.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesectsdrive.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/genesect.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesect_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/genesect_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/genesect_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/genesect_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gengar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gengar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/geodude_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/geodude_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/gible_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gible_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gigalith.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gigalith.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gigalith.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gigalith.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gigalith_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gigalith_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gigalith_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gigalith_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/girafarig_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/girafarig_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-altered.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-altered.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-altered_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-altered_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina-origin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-origin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina-origin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-origin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina-origin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-origin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/giratina-origin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/giratina-origin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/glaceon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glaceon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/glaceon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glaceon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/glaceon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glaceon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/glaceon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glaceon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/glalie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glalie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/glameow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glameow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/glameow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glameow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/glameow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glameow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/glameow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glameow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/glastrier.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glastrier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/glastrier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glastrier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/glastrier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glastrier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/glastrier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/glastrier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gligar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gligar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gligar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gligar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gligar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gligar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gligar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gligar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gliscor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gliscor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gliscor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gliscor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gliscor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gliscor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/gliscor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gliscor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gloom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gloom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gloom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gloom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gloom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gloom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gloom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gloom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gogoat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gogoat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gogoat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gogoat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gogoat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gogoat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gogoat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gogoat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golbat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golbat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golbat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golbat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golbat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golbat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golbat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golbat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/goldeen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goldeen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/goldeen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goldeen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/goldeen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goldeen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/goldeen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goldeen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golduck.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golduck.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golduck.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golduck.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golduck_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golduck_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golduck_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golduck_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/golem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golett.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golett.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golett.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golett.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golett_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golett_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golett_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golett_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/golisopod.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golisopod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/golisopod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golisopod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/golisopod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golisopod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/golisopod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golisopod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golurk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golurk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golurk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golurk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golurk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golurk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/golurk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/golurk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goodra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goodra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goomy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goomy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goomy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goomy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goomy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goomy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/goomy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/goomy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gorebyss.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gorebyss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gorebyss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gorebyss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gorebyss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gorebyss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gorebyss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gorebyss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/gossifleur.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gossifleur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/gossifleur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gossifleur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/gossifleur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gossifleur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/gossifleur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gossifleur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothita.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothitelle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothitelle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothitelle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothitelle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothitelle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothitelle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothitelle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothitelle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothorita.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothorita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothorita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothorita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothorita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothorita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gothorita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gothorita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-average.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-average.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-average_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-average_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-large.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-large.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-large.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-large.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-large_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-large_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-large_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-large_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-small.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-small.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-small.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-small.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-small_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-small_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-small_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-small_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-super.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-super.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-super.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-super.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-super_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-super_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/gourgeist-super_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gourgeist-super_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/granbull.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/granbull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/granbull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/granbull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/granbull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/granbull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/granbull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/granbull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grapploct.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grapploct.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grapploct.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grapploct.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grapploct_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grapploct_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grapploct_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grapploct_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/graveler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/graveler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/greedent.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greedent.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/greedent.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greedent.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/greedent_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greedent_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/greedent_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greedent_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja-ash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja-ash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja-ash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja-ash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja-ash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja-ash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja-ash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja-ash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/greninja_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/greninja_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/grimer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grimmsnarl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grimmsnarl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grookey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grookey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grookey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grookey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grookey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grookey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/grookey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grookey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/grotle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grotle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/grotle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grotle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/grotle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grotle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/grotle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grotle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon-primal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon-primal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon-primal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon-primal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon-primal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon-primal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon-primal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon-primal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/groudon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/groudon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grovyle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grovyle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grovyle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grovyle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grovyle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grovyle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grovyle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grovyle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/growlithe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/growlithe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/grubbin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grubbin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/grubbin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grubbin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/grubbin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grubbin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/grubbin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grubbin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grumpig.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grumpig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grumpig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grumpig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grumpig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grumpig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/grumpig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/grumpig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gulpin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gulpin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gulpin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gulpin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gulpin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gulpin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/gulpin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gulpin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/gumshoos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gumshoos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/gumshoos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gumshoos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/gumshoos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gumshoos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/gumshoos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gumshoos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gurdurr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gurdurr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gurdurr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gurdurr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gurdurr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gurdurr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/gurdurr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gurdurr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/guzzlord.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/guzzlord.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/guzzlord.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/guzzlord.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/guzzlord_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/guzzlord_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/guzzlord_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/guzzlord_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/gyarados_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/gyarados_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/hakamo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hakamo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/hakamo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hakamo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/hakamo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hakamo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/hakamo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hakamo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/happiny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/happiny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/happiny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/happiny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/happiny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/happiny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/happiny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/happiny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/hariyama.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hariyama.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/hariyama.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hariyama.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/hariyama_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hariyama_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/hariyama_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hariyama_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatenna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatenna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatenna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatenna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatenna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatenna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatenna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatenna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hatterene_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hatterene_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hattrem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hattrem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hattrem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hattrem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hattrem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hattrem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/hattrem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hattrem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/haunter.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haunter.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/haunter.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haunter.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/haunter_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haunter_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/haunter_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haunter_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hawlucha.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hawlucha.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hawlucha.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hawlucha.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hawlucha_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hawlucha_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hawlucha_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hawlucha_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/haxorus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haxorus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/haxorus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haxorus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/haxorus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haxorus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/haxorus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/haxorus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/heatmor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatmor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/heatmor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatmor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/heatmor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatmor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/heatmor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatmor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/heatran.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatran.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/heatran.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatran.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/heatran_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatran_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/heatran_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heatran_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/heliolisk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heliolisk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/heliolisk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heliolisk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/heliolisk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heliolisk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/heliolisk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heliolisk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/helioptile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/helioptile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/helioptile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/helioptile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/helioptile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/helioptile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/helioptile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/helioptile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/heracross_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/heracross_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/herdier.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/herdier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/herdier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/herdier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/herdier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/herdier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/herdier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/herdier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippopotas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippopotas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/hippowdon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hippowdon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonchan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonchan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonchan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonchan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonchan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonchan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonchan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonchan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonlee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonlee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonlee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonlee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonlee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonlee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmonlee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmonlee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmontop.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmontop.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmontop.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmontop.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmontop_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmontop_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hitmontop_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hitmontop_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ho-oh.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ho-oh.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ho-oh.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ho-oh.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ho-oh_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ho-oh_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ho-oh_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ho-oh_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/honchkrow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honchkrow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/honchkrow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honchkrow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/honchkrow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honchkrow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/honchkrow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honchkrow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/honedge.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honedge.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/honedge.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honedge.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/honedge_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honedge_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/honedge_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/honedge_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa-unbound.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa-unbound.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa-unbound.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa-unbound.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa-unbound_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa-unbound_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa-unbound_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa-unbound_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa_confined.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa_confined.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa_confined_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/hoopa_confined_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoopa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoothoot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoothoot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoothoot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoothoot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoothoot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoothoot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoothoot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoothoot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoppip.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoppip.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoppip.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoppip.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoppip_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoppip_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/hoppip_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hoppip_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/horsea.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/horsea.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/horsea.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/horsea.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/horsea_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/horsea_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/horsea_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/horsea_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndoom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndoom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndour.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/houndour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/houndour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/huntail.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/huntail.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/huntail.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/huntail.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/huntail_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/huntail_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/huntail_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/huntail_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/hydreigon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hydreigon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/hydreigon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hydreigon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/hydreigon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hydreigon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/hydreigon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hydreigon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hypno.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hypno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hypno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hypno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hypno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hypno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/hypno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/hypno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/igglybuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/igglybuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/igglybuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/igglybuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/igglybuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/igglybuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/igglybuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/igglybuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/illumise.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/illumise.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/illumise.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/illumise.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/illumise_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/illumise_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/illumise_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/illumise_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/impidimp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/impidimp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/impidimp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/impidimp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/impidimp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/impidimp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/impidimp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/impidimp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/incineroar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/incineroar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/incineroar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/incineroar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/incineroar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/incineroar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/incineroar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/incineroar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee-female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee-female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee-female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee-female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/indeedee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/indeedee-male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/infernape.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/infernape.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/infernape.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/infernape.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/infernape_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/infernape_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/infernape_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/infernape_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/inkay.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inkay.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/inkay.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inkay.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/inkay_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inkay_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/inkay_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inkay_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/inteleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/inteleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ivysaur.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ivysaur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ivysaur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ivysaur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ivysaur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ivysaur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ivysaur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ivysaur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/jangmo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jangmo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/jangmo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jangmo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/jangmo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jangmo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/jangmo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jangmo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/jellicent_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jellicent_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jigglypuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jigglypuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jigglypuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jigglypuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jigglypuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jigglypuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jigglypuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jigglypuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/jirachi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jirachi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/jirachi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jirachi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/jirachi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jirachi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/jirachi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jirachi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jolteon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jolteon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jolteon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jolteon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jolteon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jolteon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jolteon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jolteon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/joltik.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/joltik.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/joltik.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/joltik.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/joltik_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/joltik_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/joltik_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/joltik_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/jumpluff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jumpluff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/jumpluff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jumpluff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/jumpluff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jumpluff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/jumpluff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jumpluff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jynx.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jynx.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jynx.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jynx.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jynx_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jynx_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/jynx_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/jynx_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabuto.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabuto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabuto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabuto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabuto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabuto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabuto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabuto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabutops.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabutops.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabutops.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabutops.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabutops_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabutops_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kabutops_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kabutops_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kadabra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kadabra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kadabra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kadabra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kadabra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kadabra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kadabra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kadabra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kakuna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kakuna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kakuna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kakuna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kakuna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kakuna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kakuna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kakuna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kangaskhan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kangaskhan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/karrablast.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/karrablast.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/karrablast.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/karrablast.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/karrablast_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/karrablast_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/karrablast_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/karrablast_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kartana.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kartana.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kartana.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kartana.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kartana_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kartana_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kartana_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kartana_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kecleon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kecleon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kecleon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kecleon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kecleon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kecleon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kecleon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kecleon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-ordinary.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-ordinary.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-ordinary_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-ordinary_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo-resolute.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-resolute.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo-resolute.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-resolute.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo-resolute_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-resolute_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/keldeo-resolute_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/keldeo-resolute_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingdra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingdra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingdra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingdra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingdra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingdra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingdra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingdra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kingler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kingler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kirlia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kirlia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kirlia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kirlia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kirlia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kirlia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kirlia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kirlia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klang.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kleavor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kleavor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kleavor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kleavor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kleavor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kleavor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/kleavor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kleavor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/klefki.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klefki.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/klefki.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klefki.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/klefki_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klefki_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/klefki_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klefki_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klink.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klinklang.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klinklang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klinklang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klinklang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klinklang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klinklang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/klinklang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/klinklang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/koffing.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/koffing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/koffing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/koffing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/koffing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/koffing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/koffing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/koffing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/komala.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/komala.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/komala.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/komala.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/komala_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/komala_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/komala_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/komala_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kommo-o.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kommo-o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kommo-o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kommo-o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kommo-o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kommo-o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/kommo-o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kommo-o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/krabby.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krabby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/krabby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krabby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/krabby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krabby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/krabby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krabby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/kricketune_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kricketune_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krokorok.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krokorok.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krokorok.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krokorok.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krokorok_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krokorok_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krokorok_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krokorok_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krookodile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krookodile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krookodile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krookodile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krookodile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krookodile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/krookodile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/krookodile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/kubfu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kubfu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/kubfu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kubfu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/kubfu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kubfu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/kubfu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kubfu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre-primal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre-primal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre-primal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre-primal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre-primal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre-primal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre-primal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre-primal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/kyogre_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyogre_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-black.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-black.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-black.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-black.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-black_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-black_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-black_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-black_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-white.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-white.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-white.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-white.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-white_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-white_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem-white_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem-white_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/kyurem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/kyurem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lairon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lairon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lairon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lairon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lairon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lairon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lairon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lairon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lampent.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lampent.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lampent.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lampent.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lampent_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lampent_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lampent_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lampent_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/landorus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/landorus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lanturn.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lanturn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lanturn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lanturn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lanturn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lanturn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lanturn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lanturn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lapras_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lapras_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/larvesta.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvesta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/larvesta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvesta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/larvesta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvesta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/larvesta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvesta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/larvitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/larvitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/larvitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/larvitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/larvitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latias_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latias_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/latios_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/latios_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/leafeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leafeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/leafeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leafeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/leafeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leafeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/leafeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leafeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/leavanny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leavanny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/leavanny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leavanny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/leavanny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leavanny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/leavanny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/leavanny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledyba.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledyba.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledyba.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledyba.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledyba_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledyba_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ledyba_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ledyba_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickilicky.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickilicky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickilicky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickilicky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickilicky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickilicky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickilicky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickilicky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickitung.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickitung.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickitung.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickitung.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickitung_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickitung_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/lickitung_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lickitung_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/liepard.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/liepard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/liepard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/liepard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/liepard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/liepard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/liepard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/liepard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lileep.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lileep.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lileep.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lileep.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lileep_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lileep_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lileep_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lileep_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lilligant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lilligant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lillipup.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lillipup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lillipup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lillipup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lillipup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lillipup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/lillipup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lillipup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/linoone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/linoone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/litleo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litleo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/litleo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litleo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/litleo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litleo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/litleo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litleo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/litten.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litten.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/litten.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litten.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/litten_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litten_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/litten_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litten_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/litwick.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litwick.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/litwick.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litwick.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/litwick_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litwick_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/litwick_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/litwick_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lombre.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lombre.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lombre.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lombre.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lombre_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lombre_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lombre_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lombre_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lopunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lopunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lotad.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lotad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lotad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lotad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lotad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lotad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lotad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lotad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/loudred.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/loudred.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/loudred.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/loudred.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/loudred_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/loudred_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/loudred_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/loudred_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lucario_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lucario_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ludicolo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ludicolo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ludicolo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ludicolo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ludicolo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ludicolo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ludicolo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ludicolo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lugia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lugia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lugia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lugia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lugia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lugia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/lugia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lugia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lumineon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lumineon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lumineon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lumineon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lumineon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lumineon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/lumineon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lumineon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunala.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunala.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunala_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunala_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lunatone.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunatone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lunatone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunatone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lunatone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunatone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/lunatone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lunatone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lurantis.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lurantis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lurantis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lurantis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lurantis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lurantis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lurantis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lurantis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/luvdisc.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luvdisc.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/luvdisc.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luvdisc.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/luvdisc_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luvdisc_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/luvdisc_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luvdisc_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxio.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/luxray_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/luxray_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-dusk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-dusk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-dusk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-dusk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-dusk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-dusk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-dusk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-dusk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midday.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midday.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midday_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midday_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-midnight.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midnight.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-midnight.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midnight.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-midnight_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midnight_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lycanroc-midnight_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/lycanroc-midnight_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machamp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machamp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machoke.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machoke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machoke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machoke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machoke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machoke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machoke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machoke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machop.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machop.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machop.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machop.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machop_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machop_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/machop_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/machop_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magby.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/magcargo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magcargo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/magcargo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magcargo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/magcargo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magcargo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/magcargo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magcargo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/magearna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magearna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/magearna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magearna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/magearna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magearna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/magearna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magearna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magikarp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magikarp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmortar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmortar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmortar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmortar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmortar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmortar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magmortar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magmortar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnemite.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnemite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnemite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnemite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnemite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnemite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnemite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnemite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magneton.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magneton.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magneton.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magneton.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magneton_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magneton_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magneton_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magneton_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnezone.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnezone.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnezone.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnezone.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnezone_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnezone_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/magnezone_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/magnezone_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/makuhita.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/makuhita.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/makuhita.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/makuhita.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/makuhita_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/makuhita_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/makuhita_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/makuhita_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/malamar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/malamar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/malamar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/malamar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/malamar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/malamar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/malamar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/malamar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mamoswine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mamoswine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mamoswine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mamoswine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mamoswine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mamoswine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mamoswine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mamoswine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/manaphy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manaphy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/manaphy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manaphy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/manaphy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manaphy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/manaphy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manaphy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mandibuzz.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mandibuzz.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mandibuzz.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mandibuzz.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mandibuzz_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mandibuzz_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mandibuzz_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mandibuzz_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/manectric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/manectric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mankey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mankey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mankey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mankey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mankey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mankey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mankey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mankey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantyke.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantyke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantyke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantyke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantyke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantyke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mantyke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mantyke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/maractus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/maractus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/maractus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/maractus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/maractus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/maractus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/maractus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/maractus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mareanie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareanie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mareanie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareanie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mareanie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareanie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mareanie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareanie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mareep.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareep.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mareep.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareep.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mareep_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareep_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mareep_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mareep_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/marill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/marill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/marill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/marill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/marowak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marowak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/marshadow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshadow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/marshadow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshadow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/marshadow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshadow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/marshadow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshadow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/marshtomp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshtomp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/marshtomp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshtomp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/marshtomp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshtomp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/marshtomp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/marshtomp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/masquerain.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/masquerain.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/masquerain.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/masquerain.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/masquerain_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/masquerain_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/masquerain_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/masquerain_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mawile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mawile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/medicham_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/medicham_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/meditite_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meditite_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/meditite_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meditite_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/meditite_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meditite_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/meditite_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meditite_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/meganium_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meganium_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/melmetal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/melmetal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-aria.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-aria.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-aria.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-aria.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-aria_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-aria_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-aria_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-aria_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-pirouette.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-pirouette.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-pirouette.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-pirouette.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-pirouette_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-pirouette_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/meloetta-pirouette_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meloetta-pirouette_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/meltan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meltan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/meltan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meltan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/meltan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meltan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/meltan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meltan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_f.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_m.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/meowstic_m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowstic_m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/meowth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/meowth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mesprit.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mesprit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mesprit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mesprit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mesprit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mesprit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mesprit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mesprit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metagross_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metagross_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metang.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metang.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metang.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metang.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metang_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metang_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/metang_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metang_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/metapod.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metapod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/metapod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metapod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/metapod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metapod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/metapod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/metapod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mew.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-x.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-y.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo-mega-y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo-mega-y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mewtwo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mewtwo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienfoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienfoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienfoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienfoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienfoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienfoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienfoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienfoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienshao.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienshao.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienshao.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienshao.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienshao_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienshao_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/mienshao_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mienshao_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mightyena.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mightyena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mightyena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mightyena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mightyena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mightyena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mightyena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mightyena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/milcery.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milcery.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/milcery.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milcery.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/milcery_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milcery_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/milcery_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milcery_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/milotic_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/milotic_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/miltank.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/miltank.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/miltank.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/miltank.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/miltank_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/miltank_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/miltank_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/miltank_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mime-jr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mime-jr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mime-jr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mime-jr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mime-jr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mime-jr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mime-jr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mime-jr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mimikyu-disguised.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mimikyu-disguised.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mimikyu-disguised.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mimikyu-disguised.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mimikyu-disguised_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mimikyu-disguised_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mimikyu-disguised_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mimikyu-disguised_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/minccino.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minccino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/minccino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minccino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/minccino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minccino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/minccino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minccino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/minior.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minior-red-meteor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/minior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minior-red-meteor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/minior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minior-red-meteor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/minior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minior-red-meteor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/minun.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minun.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/minun.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minun.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/minun_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minun_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/minun_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/minun_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/misdreavus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/misdreavus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/misdreavus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/misdreavus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/misdreavus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/misdreavus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/misdreavus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/misdreavus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mismagius.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mismagius.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mismagius.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mismagius.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mismagius_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mismagius_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/mismagius_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mismagius_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/moltres_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/moltres_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/monferno.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/monferno.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/monferno.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/monferno.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/monferno_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/monferno_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/monferno_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/monferno_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/morelull.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morelull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/morelull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morelull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/morelull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morelull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/morelull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morelull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morgrem.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morgrem.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morgrem.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morgrem.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morgrem_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morgrem_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morgrem_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morgrem_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-full-belly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-full-belly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-full-belly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-full-belly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-full-belly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-full-belly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-full-belly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-full-belly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-hangry.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-hangry.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-hangry.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-hangry.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-hangry_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-hangry_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/morpeko-hangry_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/morpeko-hangry_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mothim.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mothim.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mothim.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mothim.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mothim_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mothim_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/mothim_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mothim_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-mime_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-mime_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-rime.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-rime.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-rime.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-rime.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-rime_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-rime_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/mr-rime_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mr-rime_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudbray.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudbray.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudbray.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudbray.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudbray_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudbray_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudbray_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudbray_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mudkip.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudkip.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mudkip.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudkip.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mudkip_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudkip_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/mudkip_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudkip_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudsdale.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudsdale.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudsdale.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudsdale.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudsdale_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudsdale_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/mudsdale_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/mudsdale_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/muk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/muk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/munchlax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munchlax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/munchlax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munchlax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/munchlax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munchlax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/munchlax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munchlax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/munna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/munna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/munna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/munna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/munna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/murkrow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/murkrow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/murkrow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/murkrow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/murkrow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/murkrow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/murkrow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/murkrow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/musharna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/musharna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/musharna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/musharna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/musharna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/musharna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/musharna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/musharna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/naganadel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/naganadel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/naganadel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/naganadel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/naganadel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/naganadel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/naganadel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/naganadel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/natu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/natu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/natu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/natu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/natu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/natu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/natu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/natu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_dawn.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dawn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_dawn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dawn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_dawn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dawn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/lunala_dawn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dawn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_dusk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dusk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_dusk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dusk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_dusk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dusk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_dusk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-dusk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma-ultra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-ultra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma-ultra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-ultra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma-ultra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-ultra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma-ultra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma-ultra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/necrozma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/necrozma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/nickit.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nickit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/nickit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nickit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/nickit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nickit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/nickit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nickit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoking.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoqueen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoqueen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoqueen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoqueen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoqueen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoqueen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoqueen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoqueen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-f.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-m.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidoran-m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidoran-m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorina.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorina.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorina.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorina_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorina_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorino.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorino.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorino.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorino.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorino_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorino_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/nidorino_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nidorino_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/nihilego.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nihilego.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/nihilego.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nihilego.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/nihilego_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nihilego_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/nihilego_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nihilego_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nincada.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nincada.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nincada.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nincada.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nincada_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nincada_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nincada_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nincada_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ninetales_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninetales_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ninjask.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninjask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ninjask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninjask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ninjask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninjask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ninjask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ninjask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/noctowl.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noctowl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/noctowl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noctowl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/noctowl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noctowl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/noctowl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noctowl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noibat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noibat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noibat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noibat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noibat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noibat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noibat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noibat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noivern.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noivern.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noivern.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noivern.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noivern_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noivern_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/noivern_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/noivern_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nosepass.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nosepass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nosepass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nosepass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nosepass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nosepass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nosepass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nosepass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/numel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/numel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/numel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/numel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/numel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/numel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/numel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/numel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nuzleaf.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nuzleaf.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nuzleaf.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nuzleaf.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nuzleaf_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nuzleaf_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/nuzleaf_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/nuzleaf_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/obstagoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/obstagoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/obstagoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/obstagoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/obstagoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/obstagoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/obstagoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/obstagoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/octillery.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/octillery.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/octillery.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/octillery.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/octillery_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/octillery_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/octillery_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/octillery_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/oddish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oddish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/oddish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oddish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/oddish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oddish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/oddish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oddish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omanyte.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omanyte.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omanyte.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omanyte.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omanyte_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omanyte_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omanyte_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omanyte_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omastar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omastar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omastar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omastar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omastar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omastar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/omastar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/omastar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/onix.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/onix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/onix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/onix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/onix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/onix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/onix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/onix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oranguru.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oranguru.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oranguru.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oranguru.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oranguru_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oranguru_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oranguru_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oranguru_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/orbeetle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/orbeetle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-baile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-baile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-baile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-baile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-baile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-baile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-baile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-baile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pau.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pau.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pau.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pau.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pau_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pau_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pau_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pau_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pom-pom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pom-pom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pom-pom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pom-pom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pom-pom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pom-pom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-pom-pom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-pom-pom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-sensu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-sensu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-sensu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-sensu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-sensu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-sensu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/oricorio-sensu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oricorio-sensu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/oshawott.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oshawott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/oshawott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oshawott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/oshawott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oshawott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/oshawott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/oshawott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/overqwil.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/overqwil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/overqwil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/overqwil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/overqwil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/overqwil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/overqwil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/overqwil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/pachirisu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pachirisu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/pachirisu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pachirisu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/pachirisu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pachirisu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/pachirisu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pachirisu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia-origin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia-origin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia-origin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia-origin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia-origin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia-origin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia-origin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia-origin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/palkia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palkia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/palossand.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palossand.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/palossand.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palossand.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/palossand_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palossand_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/palossand_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palossand_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/palpitoad.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palpitoad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/palpitoad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palpitoad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/palpitoad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palpitoad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/palpitoad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/palpitoad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pancham.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pancham.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pancham.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pancham.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pancham_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pancham_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pancham_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pancham_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pangoro.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pangoro.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pangoro.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pangoro.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pangoro_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pangoro_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pangoro_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pangoro_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/panpour.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/panpour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/panpour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/panpour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/panpour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/panpour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/panpour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/panpour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansage.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansage.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansage.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansage.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansage_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansage_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansage_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansage_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansear.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pansear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pansear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/paras.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/paras.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/paras.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/paras.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/paras_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/paras_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/paras_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/paras_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/parasect.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/parasect.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/parasect.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/parasect.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/parasect_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/parasect_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/parasect_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/parasect_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/passimian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/passimian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/passimian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/passimian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/passimian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/passimian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/passimian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/passimian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/patrat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/patrat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/patrat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/patrat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/patrat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/patrat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/patrat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/patrat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pawniard.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pawniard.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pawniard.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pawniard.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pawniard_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pawniard_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pawniard_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pawniard_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/pelipper.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pelipper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/pelipper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pelipper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/pelipper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pelipper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/pelipper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pelipper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/perrserker.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/perrserker.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/perrserker.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/perrserker.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/perrserker_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/perrserker_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/perrserker_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/perrserker_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/persian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/persian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/petilil.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/petilil.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/petilil.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/petilil.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/petilil_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/petilil_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/petilil_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/petilil_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/phanpy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phanpy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/phanpy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phanpy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/phanpy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phanpy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/phanpy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phanpy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/phantump.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phantump.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/phantump.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phantump.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/phantump_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phantump_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/phantump_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phantump_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pheromosa.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pheromosa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pheromosa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pheromosa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pheromosa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pheromosa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pheromosa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pheromosa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/phione.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phione.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/phione.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phione.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/phione_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phione_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/phione_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/phione_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pichu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pichu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pichu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pichu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pichu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pichu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pichu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pichu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeotto.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeotto.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeotto.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeotto.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeotto_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeotto_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgeotto_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgeotto_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pidgey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidgey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pidove.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidove.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pidove.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidove.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pidove_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidove_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pidove_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pidove_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pignite.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pignite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pignite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pignite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pignite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pignite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/pignite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pignite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_gigantamax_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_gigantamax_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_gigantamax_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_gigantamax_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_gigantamax_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_gigantamax_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_gigantamax_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_gigantamax_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pikachu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikachu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pikipek.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikipek.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pikipek.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikipek.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pikipek_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikipek_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pikipek_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pikipek_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/piloswine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piloswine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/piloswine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piloswine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/piloswine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piloswine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/piloswine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piloswine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/pincurchin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pincurchin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/pincurchin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pincurchin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/pincurchin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pincurchin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/pincurchin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pincurchin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pineco.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pineco.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pineco.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pineco.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pineco_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pineco_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pineco_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pineco_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/pinsir_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pinsir_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/piplup.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piplup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/piplup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piplup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/piplup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piplup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/piplup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/piplup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/plusle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/plusle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/plusle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/plusle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/plusle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/plusle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/plusle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/plusle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/poipole.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poipole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/poipole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poipole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/poipole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poipole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/poipole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poipole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/politoed.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/politoed.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/politoed.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/politoed.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/politoed_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/politoed_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/politoed_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/politoed_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwag.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwag.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwag.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwag.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwag_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwag_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwag_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwag_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwhirl.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwhirl.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwhirl.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwhirl.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwhirl_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwhirl_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwhirl_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwhirl_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwrath.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwrath.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwrath.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwrath.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwrath_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwrath_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/poliwrath_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poliwrath_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_fake.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_fake.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_fake.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_fake.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_fake_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_fake_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_fake_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_fake_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_nofake.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_nofake.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_nofake.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_nofake.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_nofake_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_nofake_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/polteageist_nofake_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/polteageist_nofake_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/ponyta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ponyta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/poochyena.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poochyena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/poochyena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poochyena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/poochyena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poochyena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/poochyena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/poochyena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/popplio.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/popplio.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/popplio.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/popplio.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/popplio_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/popplio_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/popplio_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/popplio_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon-z.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon-z.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon-z.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon-z.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon-z_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon-z_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon-z_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon-z_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon2.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon2.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon2.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon2.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon2_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon2_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon2_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon2_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/porygon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/porygon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/primarina.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primarina.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/primarina.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primarina.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/primarina_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primarina_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/primarina_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primarina_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/primeape.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primeape.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/primeape.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primeape.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/primeape_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primeape_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/primeape_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/primeape_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/prinplup.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/prinplup.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/prinplup.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/prinplup.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/prinplup_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/prinplup_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/prinplup_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/prinplup_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/probopass.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/probopass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/probopass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/probopass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/probopass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/probopass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/probopass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/probopass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/psyduck.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/psyduck.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/psyduck.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/psyduck.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/psyduck_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/psyduck_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/psyduck_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/psyduck_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-average.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-average.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-average_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-average_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-large.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-large.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-large.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-large.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-large_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-large_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-large_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-large_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-small.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-small.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-small.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-small.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-small_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-small_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-small_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-small_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-super.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-super.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-super.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-super.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-super_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-super_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pumpkaboo-super_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pumpkaboo-super_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pupitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pupitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pupitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pupitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pupitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pupitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/pupitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pupitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/purrloin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purrloin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/purrloin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purrloin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/purrloin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purrloin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/purrloin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purrloin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/purugly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purugly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/purugly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purugly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/purugly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purugly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/purugly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/purugly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_f.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_m.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/pyroar_m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyroar_m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pyukumuku.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyukumuku.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pyukumuku.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyukumuku.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pyukumuku_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyukumuku_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/pyukumuku_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/pyukumuku_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quagsire.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quagsire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quagsire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quagsire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quagsire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quagsire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quagsire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quagsire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quilava.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilava.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quilava.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilava.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quilava_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilava_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/quilava_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilava_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/quilladin.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilladin.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/quilladin.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilladin.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/quilladin_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilladin_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/quilladin_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/quilladin_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/qwilfish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/qwilfish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/raboot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raboot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/raboot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raboot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/raboot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raboot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/raboot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raboot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raichu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raichu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/raikou.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raikou.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/raikou.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raikou.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/raikou_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raikou_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/raikou_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raikou_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ralts.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ralts.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ralts.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ralts.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ralts_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ralts_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/ralts_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ralts_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rampardos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rampardos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rampardos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rampardos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rampardos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rampardos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rampardos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rampardos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rapidash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rapidash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/raticate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/raticate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rattata_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rattata_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/rayquaza_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rayquaza_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regice.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regidrago.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regidrago.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regidrago.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regidrago.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regidrago_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regidrago_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regidrago_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regidrago_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regieleki.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regieleki.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regieleki.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regieleki.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regieleki_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regieleki_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/regieleki_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regieleki_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/regigigas.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regigigas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/regigigas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regigigas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/regigigas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regigigas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/regigigas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regigigas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regirock.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regirock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regirock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regirock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regirock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regirock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/regirock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/regirock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/registeel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/registeel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/registeel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/registeel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/registeel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/registeel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/registeel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/registeel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/relicanth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/relicanth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/relicanth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/relicanth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/relicanth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/relicanth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/relicanth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/relicanth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/remoraid.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/remoraid.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/remoraid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/remoraid.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/remoraid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/remoraid_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/remoraid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/remoraid_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reshiram.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reshiram.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reshiram.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reshiram.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reshiram_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reshiram_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reshiram_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reshiram_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reuniclus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reuniclus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reuniclus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reuniclus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reuniclus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reuniclus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/reuniclus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/reuniclus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhydon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhydon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhydon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhydon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhydon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhydon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhydon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhydon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyhorn.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyhorn.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyhorn.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyhorn.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyhorn_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyhorn_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyhorn_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyhorn_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyperior.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyperior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyperior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyperior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyperior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyperior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/rhyperior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rhyperior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/ribombee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ribombee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/ribombee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ribombee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/ribombee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ribombee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/ribombee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ribombee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rillaboom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rillaboom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/riolu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/riolu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/riolu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/riolu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/riolu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/riolu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/riolu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/riolu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rockruff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rockruff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rockruff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rockruff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rockruff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rockruff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rockruff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rockruff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/roggenrola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roggenrola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/roggenrola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roggenrola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/roggenrola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roggenrola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/roggenrola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roggenrola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rolycoly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rolycoly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rolycoly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rolycoly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rolycoly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rolycoly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rolycoly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rolycoly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rookidee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rookidee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rookidee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rookidee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rookidee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rookidee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/rookidee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rookidee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roselia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roselia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roselia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roselia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roselia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roselia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roselia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roselia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roserade.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roserade.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roserade.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roserade.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roserade_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roserade_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/roserade_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/roserade_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-fan.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-fan.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-fan.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-fan.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-fan_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-fan_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-fan_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-fan_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-frost.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-frost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-frost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-frost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-frost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-frost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-frost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-frost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-heat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-heat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-heat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-heat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-heat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-heat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-heat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-heat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-mow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-mow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-mow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-mow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-mow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-mow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-mow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-mow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-wash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-wash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-wash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-wash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-wash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-wash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom-wash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom-wash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/rotom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rotom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rowlet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rowlet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rowlet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rowlet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rowlet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rowlet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/rowlet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rowlet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/rufflet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rufflet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/rufflet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rufflet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/rufflet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rufflet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/rufflet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/rufflet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/runerigus.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/runerigus.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/runerigus.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/runerigus.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/runerigus_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/runerigus_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/runerigus_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/runerigus_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sableye_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sableye_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/salamence_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salamence_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salandit.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salandit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salandit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salandit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salandit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salandit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salandit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salandit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salazzle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salazzle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salazzle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salazzle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salazzle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salazzle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/salazzle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/salazzle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/samurott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/samurott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sandaconda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandaconda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sandile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sandile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sandile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sandile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandshrew_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandshrew_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sandslash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandslash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/sandygast.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandygast.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/sandygast.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandygast.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/sandygast_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandygast_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/sandygast_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sandygast_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_au_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_au_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_sp_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_sp_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_su_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_su_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sawsbuck_wi_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sawsbuck_wi_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/scatterbug.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scatterbug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/scatterbug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scatterbug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/scatterbug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scatterbug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/scatterbug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scatterbug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sceptile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sceptile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scizor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scizor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scolipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scolipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scolipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scolipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scolipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scolipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scolipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scolipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/scorbunny.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scorbunny.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/scorbunny.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scorbunny.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/scorbunny_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scorbunny_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/scorbunny_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scorbunny_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scrafty.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scrafty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scrafty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scrafty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scrafty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scrafty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scrafty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scrafty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scraggy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scraggy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scraggy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scraggy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scraggy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scraggy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/scraggy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scraggy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scyther.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scyther.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scyther.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scyther.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scyther_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scyther_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/scyther_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/scyther_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seadra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seadra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seadra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seadra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seadra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seadra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seadra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seadra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seaking.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seaking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seaking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seaking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seaking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seaking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seaking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seaking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sealeo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sealeo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sealeo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sealeo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sealeo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sealeo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sealeo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sealeo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seedot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seedot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seedot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seedot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seedot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seedot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seedot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seedot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/seel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/seismitoad.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seismitoad.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/seismitoad.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seismitoad.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/seismitoad_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seismitoad_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/seismitoad_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seismitoad_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sentret.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sentret.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sentret.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sentret.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sentret_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sentret_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sentret_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sentret_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/serperior.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/serperior.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/serperior.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/serperior.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/serperior_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/serperior_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/serperior_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/serperior_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/servine.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/servine.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/servine.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/servine.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/servine_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/servine_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/servine_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/servine_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seviper.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seviper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seviper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seviper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seviper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seviper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/seviper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/seviper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sewaddle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sewaddle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sewaddle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sewaddle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sewaddle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sewaddle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sewaddle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sewaddle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/sharpedo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sharpedo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-land.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-land.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-land.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-land.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-land_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-land_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-land_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-land_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-sky.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-sky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-sky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-sky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-sky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-sky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shaymin-sky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shaymin-sky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shedinja.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shedinja.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shedinja.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shedinja.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shedinja_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shedinja_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shedinja_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shedinja_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shelgon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelgon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shelgon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelgon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shelgon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelgon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shelgon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelgon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/shellder.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellder.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/shellder.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellder.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/shellder_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellder_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/shellder_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellder_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_east_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_east_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shellos_west_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shellos_west_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/shelmet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelmet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/shelmet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelmet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/shelmet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelmet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/shelmet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shelmet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shieldon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shieldon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shieldon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shieldon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shieldon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shieldon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shieldon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shieldon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shiftry.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiftry.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shiftry.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiftry.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shiftry_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiftry_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shiftry_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiftry_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/shiinotic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiinotic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/shiinotic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiinotic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/shiinotic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiinotic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/shiinotic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shiinotic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/shinx_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shinx_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shroomish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shroomish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shroomish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shroomish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shroomish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shroomish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shroomish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shroomish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/shuckle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuckle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/shuckle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuckle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/shuckle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuckle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/shuckle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuckle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shuppet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuppet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shuppet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuppet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shuppet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuppet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/shuppet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/shuppet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sigilyph.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sigilyph.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sigilyph.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sigilyph.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sigilyph_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sigilyph_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/sigilyph_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sigilyph_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/silcoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silcoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/silcoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silcoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/silcoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silcoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/silcoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silcoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/silicobra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silicobra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/silicobra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silicobra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/silicobra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silicobra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/silicobra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silicobra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_bug.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_bug.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_bug.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_bug.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_bug_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_bug_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_bug_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_bug_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dark.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dragon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dragon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dragon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dragon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dragon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dragon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_dragon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_dragon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_electric.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_electric.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_electric.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_electric.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_electric_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_electric_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_electric_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_electric_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fairy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fairy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fairy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fairy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fairy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fairy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fairy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fairy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fighting.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fighting.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fighting.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fighting.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fighting_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fighting_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fighting_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fighting_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fire.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fire.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fire.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fire.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fire_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fire_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_fire_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_fire_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_flying.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_flying.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_flying.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_flying.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_flying_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_flying_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_flying_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_flying_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ghost.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ghost.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ghost.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ghost.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ghost_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ghost_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ghost_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ghost_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_grass.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_grass.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_grass.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_grass.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_grass_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_grass_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_grass_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_grass_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ground.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ground.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ground.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ground.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ground_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ground_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ground_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ground_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ice.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ice.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ice.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ice.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ice_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ice_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_ice_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_ice_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_poison.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_poison.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_poison.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_poison.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_poison_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_poison_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_poison_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_poison_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_psychic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_psychic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_psychic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_psychic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_psychic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_psychic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_psychic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_psychic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_rock.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_rock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_rock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_rock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_rock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_rock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_rock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_rock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_steel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_steel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_steel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_steel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_steel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_steel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_steel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_steel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_water.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_water.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_water.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_water.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_water_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_water_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/silvally_water_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/silvally_water_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simipour.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simipour.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simipour.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simipour.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simipour_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simipour_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simipour_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simipour_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisage.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisage.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisage.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisage.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisage_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisage_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisage_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisage_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisear.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisear.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisear.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisear.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisear_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisear_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/simisear_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/simisear_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_fake.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_fake.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_fake.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_fake.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_fake_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_fake_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_fake_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_fake_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_nofake.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_nofake.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_nofake.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_nofake.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_nofake_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_nofake_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sinistea_nofake_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sinistea_nofake_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sirfetchd.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sirfetchd.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sirfetchd.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sirfetchd.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sirfetchd_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sirfetchd_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sirfetchd_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sirfetchd_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sizzlipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sizzlipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sizzlipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sizzlipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sizzlipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sizzlipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sizzlipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sizzlipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skarmory.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skarmory.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skarmory.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skarmory.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skarmory_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skarmory_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skarmory_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skarmory_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skiddo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiddo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skiddo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiddo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skiddo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiddo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skiddo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiddo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skiploom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiploom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skiploom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiploom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skiploom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiploom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/skiploom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skiploom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/skitty.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skitty.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/skitty.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skitty.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/skitty_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skitty_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/skitty_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skitty_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skorupi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skorupi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skorupi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skorupi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skorupi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skorupi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skorupi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skorupi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skrelp.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skrelp.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skrelp.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skrelp.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skrelp_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skrelp_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/skrelp_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skrelp_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skuntank.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skuntank.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skuntank.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skuntank.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skuntank_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skuntank_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/skuntank_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skuntank_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/skwovet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skwovet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/skwovet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skwovet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/skwovet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skwovet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/skwovet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/skwovet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slaking.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slaking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slaking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slaking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slaking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slaking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slaking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slaking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slakoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slakoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slakoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slakoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slakoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slakoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/slakoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slakoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/sliggoo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sliggoo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowbro_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowbro_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowking_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowking_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/slowpoke_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slowpoke_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/slugma.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slugma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/slugma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slugma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/slugma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slugma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/slugma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slugma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/slurpuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slurpuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/slurpuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slurpuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/slurpuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slurpuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/slurpuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/slurpuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/smeargle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smeargle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/smeargle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smeargle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/smeargle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smeargle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/smeargle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smeargle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/smoochum.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smoochum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/smoochum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smoochum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/smoochum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smoochum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/smoochum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/smoochum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sneasler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sneasler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/snivy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snivy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/snivy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snivy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/snivy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snivy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/snivy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snivy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/snom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/snom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/snom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/snom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/snorlax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorlax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/snorunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/snorunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/snorunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/snorunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snorunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/snover.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snover.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/snover.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snover.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/snover_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snover_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/snover_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snover_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/snubbull.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snubbull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/snubbull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snubbull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/snubbull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snubbull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/snubbull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/snubbull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sobble.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sobble.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sobble.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sobble.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sobble_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sobble_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/sobble_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sobble_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solgaleo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solgaleo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solgaleo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/solgaleo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solgaleo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/solosis.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solosis.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/solosis.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solosis.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/solosis_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solosis_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/solosis_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solosis_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/solrock.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solrock.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/solrock.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solrock.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/solrock_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solrock_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/solrock_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/solrock_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/spearow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spearow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/spearow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spearow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/spearow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spearow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/spearow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spearow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/spectrier.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spectrier.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/spectrier.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spectrier.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/spectrier_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spectrier_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/spectrier_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spectrier_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spewpa.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spewpa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spewpa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spewpa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spewpa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spewpa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spewpa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spewpa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spheal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spheal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spheal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spheal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spheal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spheal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spheal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spheal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/spinarak.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinarak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/spinarak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinarak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/spinarak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinarak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/spinarak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinarak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spinda.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinda.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spinda.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinda.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spinda_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinda_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spinda_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spinda_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/spiritomb.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spiritomb.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/spiritomb.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spiritomb.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/spiritomb_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spiritomb_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/spiritomb_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spiritomb_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spoink.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spoink.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spoink.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spoink.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spoink_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spoink_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/spoink_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spoink_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spritzee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spritzee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spritzee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spritzee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spritzee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spritzee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/spritzee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/spritzee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/squirtle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/squirtle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/squirtle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/squirtle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/squirtle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/squirtle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/squirtle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/squirtle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stakataka.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stakataka.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stakataka.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stakataka.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stakataka_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stakataka_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stakataka_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stakataka_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/stantler.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stantler.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/stantler.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stantler.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/stantler_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stantler_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/stantler_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stantler_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staraptor.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staraptor.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staraptor.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staraptor.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staraptor_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staraptor_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staraptor_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staraptor_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staravia.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staravia.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staravia.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staravia.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staravia_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staravia_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/staravia_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staravia_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/starly.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starly.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/starly.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starly.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/starly_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starly_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/starly_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starly_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/starmie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starmie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/starmie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starmie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/starmie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starmie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/starmie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/starmie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/staryu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staryu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/staryu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staryu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/staryu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staryu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/staryu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/staryu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/steelix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steelix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/steenee.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steenee.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/steenee.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steenee.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/steenee_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steenee_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/steenee_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/steenee_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/stonjourner.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stonjourner.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/stonjourner.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stonjourner.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/stonjourner_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stonjourner_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/stonjourner_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stonjourner_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stoutland.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stoutland.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stoutland.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stoutland.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stoutland_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stoutland_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stoutland_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stoutland_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stufful.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stufful.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stufful.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stufful.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stufful_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stufful_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/stufful_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stufful_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/stunfisk_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunfisk_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/stunky.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunky.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/stunky.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunky.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/stunky_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunky_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/stunky_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/stunky_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sudowoodo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sudowoodo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sudowoodo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sudowoodo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sudowoodo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sudowoodo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sudowoodo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sudowoodo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/suicune.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/suicune.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/suicune.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/suicune.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/suicune_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/suicune_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/suicune_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/suicune_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunflora.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunflora.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunflora.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunflora.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunflora_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunflora_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunflora_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunflora_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunkern.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunkern.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunkern.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunkern.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunkern_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunkern_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/sunkern_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sunkern_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/surskit.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/surskit.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/surskit.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/surskit.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/surskit_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/surskit_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/surskit_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/surskit_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swablu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swablu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swablu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swablu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swablu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swablu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swablu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swablu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swadloon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swadloon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swadloon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swadloon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swadloon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swadloon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swadloon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swadloon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swalot.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swalot.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swalot.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swalot.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swalot_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swalot_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swalot_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swalot_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swampert_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swampert_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swanna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swanna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swanna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swanna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swanna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swanna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swanna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swanna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swellow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swellow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swellow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swellow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swellow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swellow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/swellow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swellow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/swinub.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swinub.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/swinub.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swinub.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/swinub_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swinub_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/swinub_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swinub_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/swirlix.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swirlix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/swirlix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swirlix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/swirlix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swirlix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/swirlix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swirlix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swoobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swoobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swoobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swoobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swoobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swoobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/swoobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/swoobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sylveon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sylveon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sylveon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sylveon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sylveon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sylveon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/sylveon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/sylveon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/taillow.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/taillow.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/taillow.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/taillow.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/taillow_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/taillow_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/taillow_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/taillow_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/talonflame.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/talonflame.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/talonflame.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/talonflame.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/talonflame_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/talonflame_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/talonflame_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/talonflame_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangela.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangela.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangela.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangela.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangela_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangela_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangela_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangela_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangrowth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangrowth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangrowth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangrowth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangrowth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangrowth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tangrowth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tangrowth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-bulu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-bulu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-bulu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-bulu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-bulu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-bulu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-bulu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-bulu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-fini.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-fini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-fini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-fini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-fini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-fini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-fini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-fini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-koko.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-koko.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-koko.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-koko.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-koko_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-koko_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-koko_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-koko_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-lele.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-lele.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-lele.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-lele.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-lele_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-lele_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tapu-lele_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tapu-lele_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tauros.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tauros.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tauros.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tauros.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tauros_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tauros_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tauros_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tauros_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/teddiursa.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/teddiursa.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/teddiursa.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/teddiursa.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/teddiursa_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/teddiursa_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/teddiursa_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/teddiursa_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacool.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacool.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacool.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacool.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacool_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacool_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacool_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacool_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacruel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacruel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacruel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacruel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacruel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacruel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tentacruel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tentacruel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tepig.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tepig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tepig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tepig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tepig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tepig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tepig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tepig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/terrakion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/terrakion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/terrakion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/terrakion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/terrakion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/terrakion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/terrakion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/terrakion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thievul.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thievul.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thievul.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thievul.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thievul_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thievul_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thievul_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thievul_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/throh.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/throh.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/throh.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/throh.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/throh_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/throh_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/throh_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/throh_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/thundurus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thundurus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thwackey.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thwackey.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thwackey.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thwackey.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thwackey_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thwackey_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/thwackey_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/thwackey_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/timburr.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/timburr.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/timburr.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/timburr.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/timburr_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/timburr_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/timburr_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/timburr_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tirtouga.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tirtouga.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tirtouga.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tirtouga.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tirtouga_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tirtouga_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tirtouga_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tirtouga_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/togedemaru.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togedemaru.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/togedemaru.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togedemaru.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/togedemaru_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togedemaru_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/togedemaru_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togedemaru_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togekiss.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togekiss.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togekiss.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togekiss.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togekiss_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togekiss_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togekiss_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togekiss_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togepi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togepi.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togepi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togepi.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togepi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togepi_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togepi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togepi_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togetic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togetic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togetic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togetic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togetic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togetic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/togetic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/togetic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torchic.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torchic.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torchic.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torchic.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torchic_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torchic_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torchic_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torchic_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torkoal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torkoal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torkoal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torkoal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torkoal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torkoal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/torkoal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torkoal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-incarnate.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-incarnate.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-incarnate.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-incarnate.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-incarnate_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-incarnate_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-incarnate_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-incarnate_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-therian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-therian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-therian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-therian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-therian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-therian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tornadus-therian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tornadus-therian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/torracat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torracat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/torracat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torracat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/torracat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torracat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/torracat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torracat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/torterra.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torterra.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/torterra.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torterra.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/torterra_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torterra_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/torterra_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/torterra_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/totodile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/totodile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/totodile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/totodile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/totodile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/totodile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/totodile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/totodile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toucannon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toucannon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toucannon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toucannon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toucannon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toucannon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toucannon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toucannon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toxapex.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxapex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toxapex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxapex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toxapex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxapex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/toxapex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxapex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/toxicroak_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxicroak_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-amped_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-amped_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/toxtricity-low-key_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/toxtricity-low-key_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tranquill.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tranquill.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tranquill.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tranquill.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tranquill_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tranquill_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tranquill_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tranquill_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/trapinch.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trapinch.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/trapinch.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trapinch.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/trapinch_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trapinch_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/trapinch_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trapinch_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/treecko.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/treecko.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/treecko.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/treecko.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/treecko_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/treecko_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/treecko_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/treecko_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/trevenant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trevenant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/trevenant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trevenant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/trevenant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trevenant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/trevenant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trevenant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/tropius.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tropius.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/tropius.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tropius.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/tropius_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tropius_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/tropius_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tropius_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/trubbish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trubbish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/trubbish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trubbish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/trubbish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trubbish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/trubbish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trubbish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/trumbeak.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trumbeak.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/trumbeak.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trumbeak.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/trumbeak_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trumbeak_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/trumbeak_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/trumbeak_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tsareena.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tsareena.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tsareena.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tsareena.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tsareena_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tsareena_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/tsareena_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tsareena_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/turtonator.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtonator.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/turtonator.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtonator.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/turtonator_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtonator_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/turtonator_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtonator_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/turtwig.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtwig.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/turtwig.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtwig.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/turtwig_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtwig_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/turtwig_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/turtwig_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tympole.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tympole.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tympole.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tympole.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tympole_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tympole_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tympole_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tympole_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tynamo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tynamo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tynamo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tynamo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tynamo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tynamo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/tynamo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tynamo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/type-null.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/type-null.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/type-null.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/type-null.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/type-null_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/type-null_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/type-null_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/type-null_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/typhlosion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/typhlosion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/tyranitar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyranitar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrantrum.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrantrum.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrantrum.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrantrum.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrantrum_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrantrum_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrantrum_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrantrum_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tyrogue.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrogue.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tyrogue.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrogue.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tyrogue_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrogue_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/tyrogue_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrogue_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrunt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrunt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrunt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrunt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrunt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrunt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/tyrunt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/tyrunt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/umbreon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/umbreon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/umbreon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/umbreon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/umbreon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/umbreon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/umbreon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/umbreon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/unfezant_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unfezant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_a.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_a.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_a.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_a.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_a_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_a_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_a_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_a_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_b.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_b.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_b.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_b.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_b_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_b_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_b_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_b_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_c.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_c.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_c.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_c.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_c_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_c_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_c_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_c_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_d.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_d.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_d.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_d.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_d_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_d_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_d_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_d_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_e.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_e.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_e.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_e.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_e_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_e_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_e_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_e_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_ex.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_ex.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_ex.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_ex.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_ex_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_ex_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_ex_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_ex_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_f.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_f.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_f.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_f.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_f_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_f_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_f_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_f_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_g.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_g.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_g.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_g.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_g_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_g_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_g_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_g_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_h.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_h.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_h.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_h.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_h_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_h_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_h_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_h_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_i.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_i.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_i.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_i.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_i_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_i_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_i_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_i_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_j.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_j.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_j.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_j.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_j_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_j_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_j_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_j_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_k.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_k.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_k.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_k.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_k_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_k_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_k_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_k_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_l.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_l.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_l.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_l.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_l_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_l_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_l_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_l_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_m.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_m.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_m.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_m.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_m_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_m_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_m_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_m_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_n.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_n.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_n.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_n.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_n_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_n_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_n_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_n_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_o.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_o.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_o.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_o.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_o_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_o_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_o_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_o_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_p.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_p.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_p.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_p.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_p_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_p_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_p_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_p_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_q.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_q.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_q.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_q.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_q_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_q_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_q_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_q_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_qu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_qu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_qu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_qu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_qu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_qu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_qu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_qu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_r.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_r.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_r.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_r.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_r_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_r_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_r_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_r_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_s_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_s_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_s_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_s_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_t.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_t.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_t.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_t.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_t_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_t_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_t_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_t_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_u.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_u.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_u.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_u.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_u_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_u_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_u_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_u_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_v.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_v.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_v.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_v.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_v_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_v_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_v_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_v_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_w.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_w.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_w.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_w.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_w_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_w_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_w_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_w_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_x.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_x.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_x.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_x.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_x_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_x_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_x_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_x_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_y.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_y.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_y.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_y.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_y_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_y_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_y_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_y_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_z.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_z.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_z.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_z.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_z_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_z_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/unown_z_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/unown_z_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaluna.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaluna.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaluna.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaluna.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaluna_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaluna_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaluna_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaluna_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaring.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaring.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaring.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaring.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaring_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaring_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/ursaring_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/ursaring_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-rapid-strike-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-rapid-strike-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-rapid-strike-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-rapid-strike-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_rapid.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_rapid.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_rapid_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_rapid_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-rapid-strike_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-single-strike-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-single-strike-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-single-strike-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu-single-strike-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_single.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_single.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_single_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/urshifu_single_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/urshifu-single-strike_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/uxie.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/uxie.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/uxie.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/uxie.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/uxie_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/uxie_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/uxie_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/uxie_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillish.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillish.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillish.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillish.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillish_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillish_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillish_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillish_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillite.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillite.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillite.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillite.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillite_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillite_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanillite_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanillite_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanilluxe.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanilluxe.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanilluxe.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanilluxe.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanilluxe_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanilluxe_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vanilluxe_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vanilluxe_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vaporeon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vaporeon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vaporeon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vaporeon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vaporeon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vaporeon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vaporeon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vaporeon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/venipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/venipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/venipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/venipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venomoth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venomoth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venomoth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venomoth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venomoth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venomoth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venomoth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venomoth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venonat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venonat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venonat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venonat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venonat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venonat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venonat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venonat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-gmax.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-gmax.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-gmax.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-gmax.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-gmax_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-gmax_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-gmax_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-gmax_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-mega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-mega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-mega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-mega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-mega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-mega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur-mega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur-mega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/venusaur_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/venusaur_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/vespiquen.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vespiquen.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/vespiquen.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vespiquen.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/vespiquen_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vespiquen_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/vespiquen_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vespiquen_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vibrava.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vibrava.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vibrava.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vibrava.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vibrava_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vibrava_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vibrava_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vibrava_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/victini.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victini.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/victini.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victini.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/victini_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victini_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/victini_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victini_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/victreebel.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victreebel.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/victreebel.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victreebel.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/victreebel_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victreebel_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/victreebel_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/victreebel_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vigoroth.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vigoroth.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vigoroth.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vigoroth.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vigoroth_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vigoroth_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/vigoroth_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vigoroth_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/vikavolt.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vikavolt.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/vikavolt.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vikavolt.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/vikavolt_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vikavolt_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/vikavolt_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vikavolt_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vileplume.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vileplume.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vileplume.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vileplume.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vileplume_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vileplume_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vileplume_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vileplume_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/virizion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/virizion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/virizion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/virizion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/virizion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/virizion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/virizion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/virizion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_de_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_de_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_el_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_el_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_en_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_en_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_he_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_he_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_ic_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_ic_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mod_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mod_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_mon_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_mon_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_oc_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_oc_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_po_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_po_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_sa_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_sa_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_male.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_male.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_male.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_male.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_male_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_male_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/vivillon_su_male_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vivillon_su_male_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/volbeat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volbeat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/volbeat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volbeat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/volbeat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volbeat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/volbeat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volbeat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/volcanion.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcanion.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/volcanion.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcanion.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/volcanion_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcanion_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/volcanion_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcanion_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/volcarona.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcarona.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/volcarona.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcarona.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/volcarona_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcarona_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/volcarona_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/volcarona_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/voltorb_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/voltorb_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vullaby.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vullaby.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vullaby.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vullaby.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vullaby_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vullaby_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/vullaby_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vullaby_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix-alola.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix-alola.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix-alola.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix-alola.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix-alola_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix-alola_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix-alola_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix-alola_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/vulpix_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/vulpix_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailmer.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailmer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailmer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailmer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailmer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailmer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailmer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailmer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailord.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailord.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailord.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailord.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailord_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailord_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wailord_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wailord_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/walrein.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/walrein.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/walrein.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/walrein.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/walrein_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/walrein_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/walrein_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/walrein_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wartortle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wartortle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wartortle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wartortle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wartortle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wartortle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wartortle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wartortle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/watchog.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/watchog.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/watchog.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/watchog.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/watchog_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/watchog_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/watchog_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/watchog_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/weavile.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weavile.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/weavile.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weavile.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/weavile_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weavile_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/weavile_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weavile_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weedle.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weedle.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weedle.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weedle.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weedle_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weedle_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weedle_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weedle_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weepinbell.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weepinbell.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weepinbell.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weepinbell.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weepinbell_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weepinbell_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weepinbell_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weepinbell_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/weezing_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/weezing_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whimsicott.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whimsicott.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whimsicott.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whimsicott.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whimsicott_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whimsicott_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whimsicott_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whimsicott_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whirlipede.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whirlipede.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whirlipede.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whirlipede.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whirlipede_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whirlipede_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/whirlipede_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whirlipede_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whiscash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whiscash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whiscash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whiscash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whiscash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whiscash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whiscash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whiscash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whismur.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whismur.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whismur.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whismur.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whismur_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whismur_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/whismur_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/whismur_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wigglytuff.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wigglytuff.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wigglytuff.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wigglytuff.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wigglytuff_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wigglytuff_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/wigglytuff_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wigglytuff_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wimpod.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wimpod.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wimpod.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wimpod.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wimpod_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wimpod_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wimpod_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wimpod_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wingull.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wingull.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wingull.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wingull.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wingull_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wingull_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wingull_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wingull_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi-school.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-school.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi-school.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-school.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi-school_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-school_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi-school_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-school_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-solo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-solo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-solo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/wishiwashi_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wishiwashi-solo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_female.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_female.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_female.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_female.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_female_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_female_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_female_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_female_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wobbuffet_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wobbuffet_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/woobat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/woobat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/woobat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/woobat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/woobat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/woobat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/woobat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/woobat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/wooloo.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooloo.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/wooloo.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooloo.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/wooloo_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooloo_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/wooloo_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooloo_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wooper.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wooper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wooper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wooper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wooper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-plant.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-plant.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-plant_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-plant_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-sandy.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-sandy.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-sandy.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-sandy.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-sandy_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-sandy_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-sandy_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-sandy_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-trash.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-trash.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-trash.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-trash.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-trash_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-trash_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_4/entity_icon/textures/wormadam-trash_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wormadam-trash_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wurmple.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wurmple.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wurmple.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wurmple.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wurmple_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wurmple_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/wurmple_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wurmple_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wynaut.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wynaut.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wynaut.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wynaut.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wynaut_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wynaut_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wynaut_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wynaut_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wyrdeer.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wyrdeer.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wyrdeer.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wyrdeer.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wyrdeer_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wyrdeer_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/wyrdeer_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/wyrdeer_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/xatu.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xatu.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/xatu.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xatu.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/xatu_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xatu_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/xatu_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xatu_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/xerneas.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xerneas.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/xerneas.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xerneas.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/xerneas_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xerneas_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/xerneas_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xerneas_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/xurkitree.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xurkitree.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/xurkitree.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xurkitree.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/xurkitree_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xurkitree_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/xurkitree_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/xurkitree_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/yamask_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamask_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/yamper.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamper.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/yamper.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamper.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/yamper_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamper_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/yamper_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yamper_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanma.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanma.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanma.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanma.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanma_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanma_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanma_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanma_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanmega.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanmega.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanmega.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanmega.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanmega_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanmega_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_2/entity_icon/textures/yanmega_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yanmega_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/yungoos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yungoos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/yungoos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yungoos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/yungoos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yungoos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/yungoos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yungoos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/yveltal.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yveltal.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/yveltal.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yveltal.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/yveltal_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yveltal_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/yveltal_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/yveltal_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian-crowned.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian-crowned.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian-crowned.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian-crowned.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian-crowned_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian-crowned_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian-crowned_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian-crowned_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zacian_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zacian_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta-crowned.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta-crowned.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta-crowned.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta-crowned.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta-crowned_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta-crowned_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta-crowned_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta-crowned_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zamazenta_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zamazenta_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zangoose.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zangoose.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zangoose.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zangoose.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zangoose_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zangoose_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zangoose_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zangoose_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zapdos_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zapdos_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zarude.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zarude.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zarude.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zarude.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zarude_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zarude_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_8/entity_icon/textures/zarude_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zarude_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zebstrika.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zebstrika.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zebstrika.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zebstrika.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zebstrika_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zebstrika_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zebstrika_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zebstrika_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zekrom.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zekrom.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zekrom.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zekrom.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zekrom_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zekrom_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zekrom_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zekrom_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/zeraora.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zeraora.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/zeraora.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zeraora.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/zeraora_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zeraora_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_7/entity_icon/textures/zeraora_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zeraora_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon-galar.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon-galar.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon-galar.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon-galar.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon-galar_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon-galar_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon-galar_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon-galar_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_3/entity_icon/textures/zigzagoon_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zigzagoon_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zoroark_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zoroark_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua-hisui.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua-hisui.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua-hisui.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua-hisui.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua-hisui_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua-hisui_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua-hisui_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua-hisui_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zorua_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zorua_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zubat.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zubat.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zubat.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zubat.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zubat_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zubat_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_1/entity_icon/textures/zubat_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zubat_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zweilous.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zweilous.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zweilous.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zweilous.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zweilous_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zweilous_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_5/entity_icon/textures/zweilous_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zweilous_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-10.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-10.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-10.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-10.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-10_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-10_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-10_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-10_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-50.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-50.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-50.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-50.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-50_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-50_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde-50_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-50_s.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde_100.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-complete.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde_100.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-complete.png
diff --git a/src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde_100_s.png b/src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-complete_s.png
similarity index 100%
rename from src/main/resources/assets/pokecube_mobs/gen_6/entity_icon/textures/zygarde_100_s.png
rename to src/main/resources/assets/pokecube_mobs/textures/entity_icon/pokemob/zygarde-complete_s.png
diff --git a/src/main/resources/assets/pokecube_moves/lang/de_de.json b/src/main/resources/assets/pokecube_moves/lang/de_de.json
new file mode 100644
index 0000000000..545cc5b41a
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/de_de.json
@@ -0,0 +1,846 @@
+{
+  "pokemob.move.pound": "Klaps",
+  "pokemob.move.karate-chop": "Karateschlag",
+  "pokemob.move.double-slap": "Duplexhieb",
+  "pokemob.move.comet-punch": "Kometenhieb",
+  "pokemob.move.mega-punch": "Megahieb",
+  "pokemob.move.pay-day": "Zahltag",
+  "pokemob.move.fire-punch": "Feuerschlag",
+  "pokemob.move.ice-punch": "Eishieb",
+  "pokemob.move.thunder-punch": "Donnerschlag",
+  "pokemob.move.scratch": "Kratzer",
+  "pokemob.move.vice-grip": "Klammer",
+  "pokemob.move.guillotine": "Guillotine",
+  "pokemob.move.razor-wind": "Klingensturm",
+  "pokemob.move.swords-dance": "Schwerttanz",
+  "pokemob.move.cut": "Zerschneider",
+  "pokemob.move.gust": "Windstoß",
+  "pokemob.move.wing-attack": "Flügelschlag",
+  "pokemob.move.whirlwind": "Wirbelwind",
+  "pokemob.move.fly": "Fliegen",
+  "pokemob.move.bind": "Klammergriff",
+  "pokemob.move.slam": "Slam",
+  "pokemob.move.vine-whip": "Rankenhieb",
+  "pokemob.move.stomp": "Stampfer",
+  "pokemob.move.double-kick": "Doppelkick",
+  "pokemob.move.mega-kick": "Megakick",
+  "pokemob.move.jump-kick": "Sprungkick",
+  "pokemob.move.rolling-kick": "Fegekick",
+  "pokemob.move.sand-attack": "Sandwirbel",
+  "pokemob.move.headbutt": "Kopfnuss",
+  "pokemob.move.horn-attack": "Hornattacke",
+  "pokemob.move.fury-attack": "Furienschlag",
+  "pokemob.move.horn-drill": "Hornbohrer",
+  "pokemob.move.tackle": "Tackle",
+  "pokemob.move.body-slam": "Bodyslam",
+  "pokemob.move.wrap": "Wickel",
+  "pokemob.move.take-down": "Bodycheck",
+  "pokemob.move.thrash": "Fuchtler",
+  "pokemob.move.double-edge": "Risikotackle",
+  "pokemob.move.tail-whip": "Rutenschlag",
+  "pokemob.move.poison-sting": "Giftstachel",
+  "pokemob.move.twineedle": "Duonadel",
+  "pokemob.move.pin-missile": "Nadelrakete",
+  "pokemob.move.leer": "Silberblick",
+  "pokemob.move.bite": "Biss",
+  "pokemob.move.growl": "Heuler",
+  "pokemob.move.roar": "Brüller",
+  "pokemob.move.sing": "Gesang",
+  "pokemob.move.supersonic": "Superschall",
+  "pokemob.move.sonic-boom": "Ultraschall",
+  "pokemob.move.disable": "Aussetzer",
+  "pokemob.move.acid": "Säure",
+  "pokemob.move.ember": "Glut",
+  "pokemob.move.flamethrower": "Flammenwurf",
+  "pokemob.move.mist": "Weißnebel",
+  "pokemob.move.water-gun": "Aquaknarre",
+  "pokemob.move.hydro-pump": "Hydropumpe",
+  "pokemob.move.surf": "Surfer",
+  "pokemob.move.ice-beam": "Eisstrahl",
+  "pokemob.move.blizzard": "Blizzard",
+  "pokemob.move.psybeam": "Psystrahl",
+  "pokemob.move.bubble-beam": "Blubbstrahl",
+  "pokemob.move.aurora-beam": "Aurorastrahl",
+  "pokemob.move.hyper-beam": "Hyperstrahl",
+  "pokemob.move.peck": "Pikser",
+  "pokemob.move.drill-peck": "Bohrschnabel",
+  "pokemob.move.submission": "Überroller",
+  "pokemob.move.low-kick": "Fußkick",
+  "pokemob.move.counter": "Konter",
+  "pokemob.move.seismic-toss": "Geowurf",
+  "pokemob.move.strength": "Stärke",
+  "pokemob.move.absorb": "Absorber",
+  "pokemob.move.mega-drain": "Megasauger",
+  "pokemob.move.leech-seed": "Egelsamen",
+  "pokemob.move.growth": "Wachstum",
+  "pokemob.move.razor-leaf": "Rasierblatt",
+  "pokemob.move.solar-beam": "Solarstrahl",
+  "pokemob.move.poison-powder": "Giftpuder",
+  "pokemob.move.stun-spore": "Stachelspore",
+  "pokemob.move.sleep-powder": "Schlafpuder",
+  "pokemob.move.petal-dance": "Blättertanz",
+  "pokemob.move.string-shot": "Fadenschuss",
+  "pokemob.move.dragon-rage": "Drachenwut",
+  "pokemob.move.fire-spin": "Feuerwirbel",
+  "pokemob.move.thunder-shock": "Donnerschock",
+  "pokemob.move.thunderbolt": "Donnerblitz",
+  "pokemob.move.thunder-wave": "Donnerwelle",
+  "pokemob.move.thunder": "Donner",
+  "pokemob.move.rock-throw": "Steinwurf",
+  "pokemob.move.earthquake": "Erdbeben",
+  "pokemob.move.fissure": "Geofissur",
+  "pokemob.move.dig": "Schaufler",
+  "pokemob.move.toxic": "Toxin",
+  "pokemob.move.confusion": "Konfusion",
+  "pokemob.move.psychic": "Psychokinese",
+  "pokemob.move.hypnosis": "Hypnose",
+  "pokemob.move.meditate": "Meditation",
+  "pokemob.move.agility": "Agilität",
+  "pokemob.move.quick-attack": "Ruckzuckhieb",
+  "pokemob.move.rage": "Raserei",
+  "pokemob.move.teleport": "Teleport",
+  "pokemob.move.night-shade": "Nachtnebel",
+  "pokemob.move.mimic": "Mimikry",
+  "pokemob.move.screech": "Kreideschrei",
+  "pokemob.move.double-team": "Doppelteam",
+  "pokemob.move.recover": "Genesung",
+  "pokemob.move.harden": "Härtner",
+  "pokemob.move.minimize": "Komprimator",
+  "pokemob.move.smokescreen": "Rauchwolke",
+  "pokemob.move.confuse-ray": "Konfusstrahl",
+  "pokemob.move.withdraw": "Panzerschutz",
+  "pokemob.move.defense-curl": "Einigler",
+  "pokemob.move.barrier": "Barriere",
+  "pokemob.move.light-screen": "Lichtschild",
+  "pokemob.move.haze": "Dunkelnebel",
+  "pokemob.move.reflect": "Reflektor",
+  "pokemob.move.focus-energy": "Energiefokus",
+  "pokemob.move.bide": "Geduld",
+  "pokemob.move.metronome": "Metronom",
+  "pokemob.move.mirror-move": "Spiegeltrick",
+  "pokemob.move.self-destruct": "Finale",
+  "pokemob.move.egg-bomb": "Eierbombe",
+  "pokemob.move.lick": "Schlecker",
+  "pokemob.move.smog": "Smog",
+  "pokemob.move.sludge": "Schlammbad",
+  "pokemob.move.bone-club": "Knochenkeule",
+  "pokemob.move.fire-blast": "Feuersturm",
+  "pokemob.move.waterfall": "Kaskade",
+  "pokemob.move.clamp": "Schnapper",
+  "pokemob.move.swift": "Sternschauer",
+  "pokemob.move.skull-bash": "Schädelwumme",
+  "pokemob.move.spike-cannon": "Dornkanone",
+  "pokemob.move.constrict": "Umklammerung",
+  "pokemob.move.amnesia": "Amnesie",
+  "pokemob.move.kinesis": "Psykraft",
+  "pokemob.move.soft-boiled": "Weichei",
+  "pokemob.move.high-jump-kick": "Turmkick",
+  "pokemob.move.glare": "Schlangenblick",
+  "pokemob.move.dream-eater": "Traumfresser",
+  "pokemob.move.poison-gas": "Giftwolke",
+  "pokemob.move.barrage": "Stakkato",
+  "pokemob.move.leech-life": "Blutsauger",
+  "pokemob.move.lovely-kiss": "Todeskuss",
+  "pokemob.move.sky-attack": "Himmelsfeger",
+  "pokemob.move.transform": "Wandler",
+  "pokemob.move.bubble": "Blubber",
+  "pokemob.move.dizzy-punch": "Irrschlag",
+  "pokemob.move.spore": "Pilzspore",
+  "pokemob.move.flash": "Blitz",
+  "pokemob.move.psywave": "Psywelle",
+  "pokemob.move.splash": "Platscher",
+  "pokemob.move.acid-armor": "Säurepanzer",
+  "pokemob.move.crabhammer": "Krabbhammer",
+  "pokemob.move.explosion": "Explosion",
+  "pokemob.move.fury-swipes": "Kratzfurie",
+  "pokemob.move.bonemerang": "Knochmerang",
+  "pokemob.move.rest": "Erholung",
+  "pokemob.move.rock-slide": "Steinhagel",
+  "pokemob.move.hyper-fang": "Hyperzahn",
+  "pokemob.move.sharpen": "Schärfer",
+  "pokemob.move.conversion": "Umwandlung",
+  "pokemob.move.tri-attack": "Triplette",
+  "pokemob.move.super-fang": "Superzahn",
+  "pokemob.move.slash": "Schlitzer",
+  "pokemob.move.substitute": "Delegator",
+  "pokemob.move.struggle": "Verzweifler",
+  "pokemob.move.sketch": "Nachahmer",
+  "pokemob.move.triple-kick": "Dreifachkick",
+  "pokemob.move.thief": "Raub",
+  "pokemob.move.spider-web": "Spinnennetz",
+  "pokemob.move.mind-reader": "Willensleser",
+  "pokemob.move.nightmare": "Nachtmahr",
+  "pokemob.move.flame-wheel": "Flammenrad",
+  "pokemob.move.snore": "Schnarcher",
+  "pokemob.move.curse": "Fluch",
+  "pokemob.move.flail": "Dreschflegel",
+  "pokemob.move.conversion-2": "Umwandlung2",
+  "pokemob.move.aeroblast": "Luftstoß",
+  "pokemob.move.cotton-spore": "Baumwollsaat",
+  "pokemob.move.reversal": "Gegenschlag",
+  "pokemob.move.spite": "Groll",
+  "pokemob.move.powder-snow": "Pulverschnee",
+  "pokemob.move.protect": "Schutzschild",
+  "pokemob.move.mach-punch": "Tempohieb",
+  "pokemob.move.scary-face": "Grimasse",
+  "pokemob.move.feint-attack": "Finte",
+  "pokemob.move.sweet-kiss": "Bitterkuss",
+  "pokemob.move.belly-drum": "Bauchtrommel",
+  "pokemob.move.sludge-bomb": "Matschbombe",
+  "pokemob.move.mud-slap": "Lehmschelle",
+  "pokemob.move.octazooka": "Octazooka",
+  "pokemob.move.spikes": "Stachler",
+  "pokemob.move.zap-cannon": "Blitzkanone",
+  "pokemob.move.foresight": "Scharfblick",
+  "pokemob.move.destiny-bond": "Abgangsbund",
+  "pokemob.move.perish-song": "Abgesang",
+  "pokemob.move.icy-wind": "Eissturm",
+  "pokemob.move.detect": "Scanner",
+  "pokemob.move.bone-rush": "Knochenhatz",
+  "pokemob.move.lock-on": "Zielschuss",
+  "pokemob.move.outrage": "Wutanfall",
+  "pokemob.move.sandstorm": "Sandsturm",
+  "pokemob.move.giga-drain": "Gigasauger",
+  "pokemob.move.endure": "Ausdauer",
+  "pokemob.move.charm": "Charme",
+  "pokemob.move.rollout": "Walzer",
+  "pokemob.move.false-swipe": "Trugschlag",
+  "pokemob.move.swagger": "Angeberei",
+  "pokemob.move.milk-drink": "Milchgetränk",
+  "pokemob.move.spark": "Funkensprung",
+  "pokemob.move.fury-cutter": "Zornklinge",
+  "pokemob.move.steel-wing": "Stahlflügel",
+  "pokemob.move.mean-look": "Horrorblick",
+  "pokemob.move.attract": "Anziehung",
+  "pokemob.move.sleep-talk": "Schlafrede",
+  "pokemob.move.heal-bell": "Vitalglocke",
+  "pokemob.move.return": "Rückkehr",
+  "pokemob.move.present": "Geschenk",
+  "pokemob.move.frustration": "Frustration",
+  "pokemob.move.safeguard": "Bodyguard",
+  "pokemob.move.pain-split": "Leidteiler",
+  "pokemob.move.sacred-fire": "Läuterfeuer",
+  "pokemob.move.magnitude": "Intensität",
+  "pokemob.move.dynamic-punch": "Wuchtschlag",
+  "pokemob.move.megahorn": "Vielender",
+  "pokemob.move.dragon-breath": "Feuerodem",
+  "pokemob.move.baton-pass": "Stafette",
+  "pokemob.move.encore": "Zugabe",
+  "pokemob.move.pursuit": "Verfolgung",
+  "pokemob.move.rapid-spin": "Turbodreher",
+  "pokemob.move.sweet-scent": "Lockduft",
+  "pokemob.move.iron-tail": "Eisenschweif",
+  "pokemob.move.metal-claw": "Metallklaue",
+  "pokemob.move.vital-throw": "Überwurf",
+  "pokemob.move.morning-sun": "Morgengrauen",
+  "pokemob.move.synthesis": "Synthese",
+  "pokemob.move.moonlight": "Mondschein",
+  "pokemob.move.hidden-power": "Kraftreserve",
+  "pokemob.move.cross-chop": "Kreuzhieb",
+  "pokemob.move.twister": "Windhose",
+  "pokemob.move.rain-dance": "Regentanz",
+  "pokemob.move.sunny-day": "Sonnentag",
+  "pokemob.move.crunch": "Knirscher",
+  "pokemob.move.mirror-coat": "Spiegelcape",
+  "pokemob.move.psych-up": "Psycho-Plus",
+  "pokemob.move.extreme-speed": "Turbotempo",
+  "pokemob.move.ancient-power": "Antik-Kraft",
+  "pokemob.move.shadow-ball": "Spukball",
+  "pokemob.move.future-sight": "Seher",
+  "pokemob.move.rock-smash": "Zertrümmerer",
+  "pokemob.move.whirlpool": "Whirlpool",
+  "pokemob.move.beat-up": "Prügler",
+  "pokemob.move.fake-out": "Mogelhieb",
+  "pokemob.move.uproar": "Aufruhr",
+  "pokemob.move.stockpile": "Horter",
+  "pokemob.move.spit-up": "Entfessler",
+  "pokemob.move.swallow": "Verzehrer",
+  "pokemob.move.heat-wave": "Hitzewelle",
+  "pokemob.move.hail": "Hagelsturm",
+  "pokemob.move.torment": "Folterknecht",
+  "pokemob.move.flatter": "Schmeichler",
+  "pokemob.move.will-o-wisp": "Irrlicht",
+  "pokemob.move.memento": "Memento-Mori",
+  "pokemob.move.facade": "Fassade",
+  "pokemob.move.focus-punch": "Power-Punch",
+  "pokemob.move.smelling-salts": "Riechsalz",
+  "pokemob.move.follow-me": "Spotlight",
+  "pokemob.move.nature-power": "Natur-Kraft",
+  "pokemob.move.charge": "Ladevorgang",
+  "pokemob.move.taunt": "Verhöhner",
+  "pokemob.move.helping-hand": "Rechte Hand",
+  "pokemob.move.trick": "Trickbetrug",
+  "pokemob.move.role-play": "Rollenspiel",
+  "pokemob.move.wish": "Wunschtraum",
+  "pokemob.move.assist": "Zuschuss",
+  "pokemob.move.ingrain": "Verwurzler",
+  "pokemob.move.superpower": "Kraftkoloss",
+  "pokemob.move.magic-coat": "Magiemantel",
+  "pokemob.move.recycle": "Aufbereitung",
+  "pokemob.move.revenge": "Vergeltung",
+  "pokemob.move.brick-break": "Durchbruch",
+  "pokemob.move.yawn": "Gähner",
+  "pokemob.move.knock-off": "Abschlag",
+  "pokemob.move.endeavor": "Notsituation",
+  "pokemob.move.eruption": "Eruption",
+  "pokemob.move.skill-swap": "Fähigkeitstausch",
+  "pokemob.move.imprison": "Begrenzer",
+  "pokemob.move.refresh": "Heilung",
+  "pokemob.move.grudge": "Nachspiel",
+  "pokemob.move.snatch": "Übernahme",
+  "pokemob.move.secret-power": "Geheimpower",
+  "pokemob.move.dive": "Taucher",
+  "pokemob.move.arm-thrust": "Armstoß",
+  "pokemob.move.camouflage": "Tarnung",
+  "pokemob.move.tail-glow": "Schweifglanz",
+  "pokemob.move.luster-purge": "Scheinwerfer",
+  "pokemob.move.mist-ball": "Nebelball",
+  "pokemob.move.feather-dance": "Daunenreigen",
+  "pokemob.move.teeter-dance": "Taumeltanz",
+  "pokemob.move.blaze-kick": "Feuerfeger",
+  "pokemob.move.mud-sport": "Lehmsuhler",
+  "pokemob.move.ice-ball": "Frostbeule",
+  "pokemob.move.needle-arm": "Nietenranke",
+  "pokemob.move.slack-off": "Tagedieb",
+  "pokemob.move.hyper-voice": "Schallwelle",
+  "pokemob.move.poison-fang": "Giftzahn",
+  "pokemob.move.crush-claw": "Zermalmklaue",
+  "pokemob.move.blast-burn": "Lohekanonade",
+  "pokemob.move.hydro-cannon": "Aquahaubitze",
+  "pokemob.move.meteor-mash": "Sternenhieb",
+  "pokemob.move.astonish": "Erstauner",
+  "pokemob.move.weather-ball": "Meteorologe",
+  "pokemob.move.aromatherapy": "Aromakur",
+  "pokemob.move.fake-tears": "Trugträne",
+  "pokemob.move.air-cutter": "Windschnitt",
+  "pokemob.move.overheat": "Hitzekoller",
+  "pokemob.move.odor-sleuth": "Schnüffler",
+  "pokemob.move.rock-tomb": "Felsgrab",
+  "pokemob.move.silver-wind": "Silberhauch",
+  "pokemob.move.metal-sound": "Metallsound",
+  "pokemob.move.grass-whistle": "Grasflöte",
+  "pokemob.move.tickle": "Spaßkanone",
+  "pokemob.move.cosmic-power": "Kosmik-Kraft",
+  "pokemob.move.water-spout": "Fontränen",
+  "pokemob.move.signal-beam": "Ampelleuchte",
+  "pokemob.move.shadow-punch": "Finsterfaust",
+  "pokemob.move.extrasensory": "Sondersensor",
+  "pokemob.move.sky-uppercut": "Himmelhieb",
+  "pokemob.move.sand-tomb": "Sandgrab",
+  "pokemob.move.sheer-cold": "Eiseskälte",
+  "pokemob.move.muddy-water": "Lehmbrühe",
+  "pokemob.move.bullet-seed": "Kugelsaat",
+  "pokemob.move.aerial-ace": "Aero-Ass",
+  "pokemob.move.icicle-spear": "Eisspeer",
+  "pokemob.move.iron-defense": "Eisenabwehr",
+  "pokemob.move.block": "Rückentzug",
+  "pokemob.move.howl": "Jauler",
+  "pokemob.move.dragon-claw": "Drachenklaue",
+  "pokemob.move.frenzy-plant": "Flora-Statue",
+  "pokemob.move.bulk-up": "Protzer",
+  "pokemob.move.bounce": "Sprungfeder",
+  "pokemob.move.mud-shot": "Lehmschuss",
+  "pokemob.move.poison-tail": "Giftschweif",
+  "pokemob.move.covet": "Bezirzer",
+  "pokemob.move.volt-tackle": "Volttackle",
+  "pokemob.move.magical-leaf": "Zauberblatt",
+  "pokemob.move.water-sport": "Nassmacher",
+  "pokemob.move.calm-mind": "Gedankengut",
+  "pokemob.move.leaf-blade": "Laubklinge",
+  "pokemob.move.dragon-dance": "Drachentanz",
+  "pokemob.move.rock-blast": "Felswurf",
+  "pokemob.move.shock-wave": "Schockwelle",
+  "pokemob.move.water-pulse": "Aquawelle",
+  "pokemob.move.doom-desire": "Kismetwunsch",
+  "pokemob.move.psycho-boost": "Psyschub",
+  "pokemob.move.roost": "Ruheort",
+  "pokemob.move.gravity": "Erdanziehung",
+  "pokemob.move.miracle-eye": "Wunderauge",
+  "pokemob.move.wake-up-slap": "Weckruf",
+  "pokemob.move.hammer-arm": "Hammerarm",
+  "pokemob.move.gyro-ball": "Gyroball",
+  "pokemob.move.healing-wish": "Heilopfer",
+  "pokemob.move.brine": "Lake",
+  "pokemob.move.natural-gift": "Beerenkräfte",
+  "pokemob.move.feint": "Offenlegung",
+  "pokemob.move.pluck": "Pflücker",
+  "pokemob.move.tailwind": "Rückenwind",
+  "pokemob.move.acupressure": "Akupressur",
+  "pokemob.move.metal-burst": "Metallstoß",
+  "pokemob.move.u-turn": "Kehrtwende",
+  "pokemob.move.close-combat": "Nahkampf",
+  "pokemob.move.payback": "Gegenstoß",
+  "pokemob.move.assurance": "Gewissheit",
+  "pokemob.move.embargo": "Itemsperre",
+  "pokemob.move.fling": "Schleuder",
+  "pokemob.move.psycho-shift": "Psybann",
+  "pokemob.move.trump-card": "Trumpfkarte",
+  "pokemob.move.heal-block": "Heilblockade",
+  "pokemob.move.wring-out": "Auswringen",
+  "pokemob.move.power-trick": "Krafttrick",
+  "pokemob.move.gastro-acid": "Magensäfte",
+  "pokemob.move.lucky-chant": "Beschwörung",
+  "pokemob.move.me-first": "Egotrip",
+  "pokemob.move.copycat": "Imitator",
+  "pokemob.move.power-swap": "Krafttausch",
+  "pokemob.move.guard-swap": "Schutztausch",
+  "pokemob.move.punishment": "Strafattacke",
+  "pokemob.move.last-resort": "Zuflucht",
+  "pokemob.move.worry-seed": "Sorgensamen",
+  "pokemob.move.sucker-punch": "Tiefschlag",
+  "pokemob.move.toxic-spikes": "Giftspitzen",
+  "pokemob.move.heart-swap": "Statustausch",
+  "pokemob.move.aqua-ring": "Wasserring",
+  "pokemob.move.magnet-rise": "Magnetflug",
+  "pokemob.move.flare-blitz": "Flammenblitz",
+  "pokemob.move.force-palm": "Kraftwelle",
+  "pokemob.move.aura-sphere": "Aurasphäre",
+  "pokemob.move.rock-polish": "Steinpolitur",
+  "pokemob.move.poison-jab": "Gifthieb",
+  "pokemob.move.dark-pulse": "Finsteraura",
+  "pokemob.move.night-slash": "Nachthieb",
+  "pokemob.move.aqua-tail": "Nassschweif",
+  "pokemob.move.seed-bomb": "Samenbomben",
+  "pokemob.move.air-slash": "Luftschnitt",
+  "pokemob.move.x-scissor": "Kreuzschere",
+  "pokemob.move.bug-buzz": "Käfergebrumm",
+  "pokemob.move.dragon-pulse": "Drachenpuls",
+  "pokemob.move.dragon-rush": "Drachenstoß",
+  "pokemob.move.power-gem": "Juwelenkraft",
+  "pokemob.move.drain-punch": "Ableithieb",
+  "pokemob.move.vacuum-wave": "Vakuumwelle",
+  "pokemob.move.focus-blast": "Fokusstoß",
+  "pokemob.move.energy-ball": "Energieball",
+  "pokemob.move.brave-bird": "Sturzflug",
+  "pokemob.move.earth-power": "Erdkräfte",
+  "pokemob.move.switcheroo": "Wechseldich",
+  "pokemob.move.giga-impact": "Gigastoß",
+  "pokemob.move.nasty-plot": "Ränkeschmied",
+  "pokemob.move.bullet-punch": "Patronenhieb",
+  "pokemob.move.avalanche": "Lawine",
+  "pokemob.move.ice-shard": "Eissplitter",
+  "pokemob.move.shadow-claw": "Dunkelklaue",
+  "pokemob.move.thunder-fang": "Donnerzahn",
+  "pokemob.move.ice-fang": "Eiszahn",
+  "pokemob.move.fire-fang": "Feuerzahn",
+  "pokemob.move.shadow-sneak": "Schattenstoß",
+  "pokemob.move.mud-bomb": "Schlammbombe",
+  "pokemob.move.psycho-cut": "Psychoklinge",
+  "pokemob.move.zen-headbutt": "Zen-Kopfstoß",
+  "pokemob.move.mirror-shot": "Spiegelsalve",
+  "pokemob.move.flash-cannon": "Lichtkanone",
+  "pokemob.move.rock-climb": "Kraxler",
+  "pokemob.move.defog": "Auflockern",
+  "pokemob.move.trick-room": "Bizarroraum",
+  "pokemob.move.draco-meteor": "Draco Meteor",
+  "pokemob.move.discharge": "Ladungsstoß",
+  "pokemob.move.lava-plume": "Flammensturm",
+  "pokemob.move.leaf-storm": "Blättersturm",
+  "pokemob.move.power-whip": "Blattgeißel",
+  "pokemob.move.rock-wrecker": "Felswerfer",
+  "pokemob.move.cross-poison": "Giftstreich",
+  "pokemob.move.gunk-shot": "Mülltreffer",
+  "pokemob.move.iron-head": "Eisenschädel",
+  "pokemob.move.magnet-bomb": "Magnetbombe",
+  "pokemob.move.stone-edge": "Steinkante",
+  "pokemob.move.captivate": "Liebreiz",
+  "pokemob.move.stealth-rock": "Tarnsteine",
+  "pokemob.move.grass-knot": "Strauchler",
+  "pokemob.move.chatter": "Geschwätz",
+  "pokemob.move.judgment": "Urteilskraft",
+  "pokemob.move.bug-bite": "Käferbiss",
+  "pokemob.move.charge-beam": "Ladestrahl",
+  "pokemob.move.wood-hammer": "Holzhammer",
+  "pokemob.move.aqua-jet": "Wasserdüse",
+  "pokemob.move.attack-order": "Schlagbefehl",
+  "pokemob.move.defend-order": "Blockbefehl",
+  "pokemob.move.heal-order": "Heilbefehl",
+  "pokemob.move.head-smash": "Kopfstoß",
+  "pokemob.move.double-hit": "Doppelschlag",
+  "pokemob.move.roar-of-time": "Zeitenlärm",
+  "pokemob.move.spacial-rend": "Raumschlag",
+  "pokemob.move.lunar-dance": "Lunartanz",
+  "pokemob.move.crush-grip": "Quetschgriff",
+  "pokemob.move.magma-storm": "Lavasturm",
+  "pokemob.move.dark-void": "Schlummerort",
+  "pokemob.move.seed-flare": "Schocksamen",
+  "pokemob.move.ominous-wind": "Unheilböen",
+  "pokemob.move.shadow-force": "Schemenkraft",
+  "pokemob.move.hone-claws": "Klauenwetzer",
+  "pokemob.move.wide-guard": "Rundumschutz",
+  "pokemob.move.guard-split": "Schutzteiler",
+  "pokemob.move.power-split": "Kraftteiler",
+  "pokemob.move.wonder-room": "Wunderraum",
+  "pokemob.move.psyshock": "Psychoschock",
+  "pokemob.move.venoshock": "Giftschock",
+  "pokemob.move.autotomize": "Autotomie",
+  "pokemob.move.rage-powder": "Wutpulver",
+  "pokemob.move.telekinesis": "Telekinese",
+  "pokemob.move.magic-room": "Magieraum",
+  "pokemob.move.smack-down": "Katapult",
+  "pokemob.move.storm-throw": "Bergsturm",
+  "pokemob.move.flame-burst": "Funkenflug",
+  "pokemob.move.sludge-wave": "Schlammwoge",
+  "pokemob.move.quiver-dance": "Falterreigen",
+  "pokemob.move.heavy-slam": "Rammboss",
+  "pokemob.move.synchronoise": "Synchrolärm",
+  "pokemob.move.electro-ball": "Elektroball",
+  "pokemob.move.soak": "Überflutung",
+  "pokemob.move.flame-charge": "Nitroladung",
+  "pokemob.move.coil": "Einrollen",
+  "pokemob.move.low-sweep": "Fußtritt",
+  "pokemob.move.acid-spray": "Säurespeier",
+  "pokemob.move.foul-play": "Schmarotzer",
+  "pokemob.move.simple-beam": "Wankelstrahl",
+  "pokemob.move.entrainment": "Zwango",
+  "pokemob.move.after-you": "Galanterie",
+  "pokemob.move.round": "Kanon",
+  "pokemob.move.echoed-voice": "Widerhall",
+  "pokemob.move.chip-away": "Zermürben",
+  "pokemob.move.clear-smog": "Klärsmog",
+  "pokemob.move.stored-power": "Kraftvorrat",
+  "pokemob.move.quick-guard": "Rapidschutz",
+  "pokemob.move.ally-switch": "Seitentausch",
+  "pokemob.move.scald": "Siedewasser",
+  "pokemob.move.shell-smash": "Hausbruch",
+  "pokemob.move.heal-pulse": "Heilwoge",
+  "pokemob.move.hex": "Bürde",
+  "pokemob.move.sky-drop": "Freier Fall",
+  "pokemob.move.shift-gear": "Gangwechsel",
+  "pokemob.move.circle-throw": "Überkopfwurf",
+  "pokemob.move.incinerate": "Einäschern",
+  "pokemob.move.quash": "Verzögerung",
+  "pokemob.move.acrobatics": "Akrobatik",
+  "pokemob.move.reflect-type": "Typenspiegel",
+  "pokemob.move.retaliate": "Heimzahlung",
+  "pokemob.move.final-gambit": "Wagemut",
+  "pokemob.move.bestow": "Offerte",
+  "pokemob.move.inferno": "Inferno",
+  "pokemob.move.water-pledge": "Wassersäulen",
+  "pokemob.move.fire-pledge": "Feuersäulen",
+  "pokemob.move.grass-pledge": "Pflanzensäulen",
+  "pokemob.move.volt-switch": "Voltwechsel",
+  "pokemob.move.struggle-bug": "Käfertrutz",
+  "pokemob.move.bulldoze": "Dampfwalze",
+  "pokemob.move.frost-breath": "Eisesodem",
+  "pokemob.move.dragon-tail": "Drachenrute",
+  "pokemob.move.work-up": "Kraftschub",
+  "pokemob.move.electroweb": "Elektronetz",
+  "pokemob.move.wild-charge": "Stromstoß",
+  "pokemob.move.drill-run": "Schlagbohrer",
+  "pokemob.move.dual-chop": "Doppelhieb",
+  "pokemob.move.heart-stamp": "Herzstempel",
+  "pokemob.move.horn-leech": "Holzgeweih",
+  "pokemob.move.sacred-sword": "Sanctoklinge",
+  "pokemob.move.razor-shell": "Kalkklinge",
+  "pokemob.move.heat-crash": "Brandstempel",
+  "pokemob.move.leaf-tornado": "Grasmixer",
+  "pokemob.move.steamroller": "Quetschwalze",
+  "pokemob.move.cotton-guard": "Watteschild",
+  "pokemob.move.night-daze": "Nachtflut",
+  "pokemob.move.psystrike": "Psychostoß",
+  "pokemob.move.tail-slap": "Kehrschelle",
+  "pokemob.move.hurricane": "Orkan",
+  "pokemob.move.head-charge": "Steinschädel",
+  "pokemob.move.gear-grind": "Klikkdiskus",
+  "pokemob.move.searing-shot": "Flammenball",
+  "pokemob.move.techno-blast": "Techblaster",
+  "pokemob.move.relic-song": "Urgesang",
+  "pokemob.move.secret-sword": "Mystoschwert",
+  "pokemob.move.glaciate": "Eiszeit",
+  "pokemob.move.bolt-strike": "Blitzschlag",
+  "pokemob.move.blue-flare": "Blauflammen",
+  "pokemob.move.fiery-dance": "Feuerreigen",
+  "pokemob.move.freeze-shock": "Frostvolt",
+  "pokemob.move.ice-burn": "Frosthauch",
+  "pokemob.move.snarl": "Standpauke",
+  "pokemob.move.icicle-crash": "Eiszapfhagel",
+  "pokemob.move.v-create": "V-Generator",
+  "pokemob.move.fusion-flare": "Kreuzflamme",
+  "pokemob.move.fusion-bolt": "Kreuzdonner",
+  "pokemob.move.flying-press": "Flying Press",
+  "pokemob.move.mat-block": "Tatami-Schild",
+  "pokemob.move.belch": "Rülpser",
+  "pokemob.move.rototiller": "Pflüger",
+  "pokemob.move.sticky-web": "Klebenetz",
+  "pokemob.move.fell-stinger": "Stachelfinale",
+  "pokemob.move.phantom-force": "Phantomkraft",
+  "pokemob.move.trick-or-treat": "Halloween",
+  "pokemob.move.noble-roar": "Kampfgebrüll",
+  "pokemob.move.ion-deluge": "Plasmaschauer",
+  "pokemob.move.parabolic-charge": "Parabolladung",
+  "pokemob.move.forests-curse": "Waldesfluch",
+  "pokemob.move.petal-blizzard": "Blütenwirbel",
+  "pokemob.move.freeze-dry": "Gefriertrockner",
+  "pokemob.move.disarming-voice": "Säuselstimme",
+  "pokemob.move.parting-shot": "Abgangstirade",
+  "pokemob.move.topsy-turvy": "Invertigo",
+  "pokemob.move.draining-kiss": "Diebeskuss",
+  "pokemob.move.crafty-shield": "Trickschutz",
+  "pokemob.move.flower-shield": "Floraschutz",
+  "pokemob.move.grassy-terrain": "Grasfeld",
+  "pokemob.move.misty-terrain": "Nebelfeld",
+  "pokemob.move.electrify": "Elektrifizierung",
+  "pokemob.move.play-rough": "Knuddler",
+  "pokemob.move.fairy-wind": "Feenbrise",
+  "pokemob.move.moonblast": "Mondgewalt",
+  "pokemob.move.boomburst": "Überschallknall",
+  "pokemob.move.fairy-lock": "Feenschloss",
+  "pokemob.move.kings-shield": "Königsschild",
+  "pokemob.move.play-nice": "Kameradschaft",
+  "pokemob.move.confide": "Vertrauenssache",
+  "pokemob.move.diamond-storm": "Diamantsturm",
+  "pokemob.move.steam-eruption": "Dampfschwall",
+  "pokemob.move.hyperspace-hole": "Dimensionsloch",
+  "pokemob.move.water-shuriken": "Wasser-Shuriken",
+  "pokemob.move.mystical-fire": "Magieflamme",
+  "pokemob.move.spiky-shield": "Schutzstacheln",
+  "pokemob.move.aromatic-mist": "Duftwolke",
+  "pokemob.move.eerie-impulse": "Mystowellen",
+  "pokemob.move.venom-drench": "Giftfalle",
+  "pokemob.move.powder": "Pulverschleuder",
+  "pokemob.move.geomancy": "Geokontrolle",
+  "pokemob.move.magnetic-flux": "Magnetregler",
+  "pokemob.move.happy-hour": "Goldene Zeiten",
+  "pokemob.move.electric-terrain": "Elektrofeld",
+  "pokemob.move.dazzling-gleam": "Zauberschein",
+  "pokemob.move.celebrate": "Ehrentag",
+  "pokemob.move.hold-hands": "Händchenhalten",
+  "pokemob.move.baby-doll-eyes": "Kulleraugen",
+  "pokemob.move.nuzzle": "Wangenrubbler",
+  "pokemob.move.hold-back": "Zurückhaltung",
+  "pokemob.move.infestation": "Plage",
+  "pokemob.move.power-up-punch": "Steigerungshieb",
+  "pokemob.move.oblivion-wing": "Unheilsschwingen",
+  "pokemob.move.thousand-arrows": "Tausend Pfeile",
+  "pokemob.move.thousand-waves": "Tausend Wellen",
+  "pokemob.move.lands-wrath": "Bodengewalt",
+  "pokemob.move.light-of-ruin": "Lux Calamitatis",
+  "pokemob.move.origin-pulse": "Ursprungswoge",
+  "pokemob.move.precipice-blades": "Abgrundsklinge",
+  "pokemob.move.dragon-ascent": "Zenitstürmer",
+  "pokemob.move.hyperspace-fury": "Dimensionswahn",
+  "pokemob.move.breakneck-blitz--physical": "Hyper-Sprintangriff",
+  "pokemob.move.breakneck-blitz--special": "Hyper-Sprintangriff",
+  "pokemob.move.all-out-pummeling--physical": "Fulminante Faustschläge",
+  "pokemob.move.all-out-pummeling--special": "Fulminante Faustschläge",
+  "pokemob.move.supersonic-skystrike--physical": "Finaler Steilflug",
+  "pokemob.move.supersonic-skystrike--special": "Finaler Steilflug",
+  "pokemob.move.acid-downpour--physical": "Vernichtender Säureregen",
+  "pokemob.move.acid-downpour--special": "Vernichtender Säureregen",
+  "pokemob.move.tectonic-rage--physical": "Seismische Eruption",
+  "pokemob.move.tectonic-rage--special": "Seismische Eruption",
+  "pokemob.move.continental-crush--physical": "Apokalyptische Steinpresse",
+  "pokemob.move.continental-crush--special": "Apokalyptische Steinpresse",
+  "pokemob.move.savage-spin-out--physical": "Wirbelnder Insektenhieb",
+  "pokemob.move.savage-spin-out--special": "Wirbelnder Insektenhieb",
+  "pokemob.move.never-ending-nightmare--physical": "Ewige Nacht",
+  "pokemob.move.never-ending-nightmare--special": "Ewige Nacht",
+  "pokemob.move.corkscrew-crash--physical": "Turbo-Spiralkombo",
+  "pokemob.move.corkscrew-crash--special": "Turbo-Spiralkombo",
+  "pokemob.move.inferno-overdrive--physical": "Dynamische Maxiflamme",
+  "pokemob.move.inferno-overdrive--special": "Dynamische Maxiflamme",
+  "pokemob.move.hydro-vortex--physical": "Super-Wassertornado",
+  "pokemob.move.hydro-vortex--special": "Super-Wassertornado",
+  "pokemob.move.bloom-doom--physical": "Brillante Blütenpracht",
+  "pokemob.move.bloom-doom--special": "Brillante Blütenpracht",
+  "pokemob.move.gigavolt-havoc--physical": "Gigavolt-Funkensalve",
+  "pokemob.move.gigavolt-havoc--special": "Gigavolt-Funkensalve",
+  "pokemob.move.shattered-psyche--physical": "Psycho-Schmetterschlag",
+  "pokemob.move.shattered-psyche--special": "Psycho-Schmetterschlag",
+  "pokemob.move.subzero-slammer--physical": "Tobender Geofrost",
+  "pokemob.move.subzero-slammer--special": "Tobender Geofrost",
+  "pokemob.move.devastating-drake--physical": "Drastisches Drachendröhnen",
+  "pokemob.move.devastating-drake--special": "Drastisches Drachendröhnen",
+  "pokemob.move.black-hole-eclipse--physical": "Schwarzes Loch des Grauens",
+  "pokemob.move.black-hole-eclipse--special": "Schwarzes Loch des Grauens",
+  "pokemob.move.twinkle-tackle--physical": "Entzückender Sternenstoß",
+  "pokemob.move.twinkle-tackle--special": "Entzückender Sternenstoß",
+  "pokemob.move.catastropika": "Perfektes Pika-Projektil",
+  "pokemob.move.shore-up": "Sandsammler",
+  "pokemob.move.first-impression": "Überrumpler",
+  "pokemob.move.baneful-bunker": "Bunker",
+  "pokemob.move.spirit-shackle": "Schattenfessel",
+  "pokemob.move.darkest-lariat": "Dark Lariat",
+  "pokemob.move.sparkling-aria": "Schaumserenade",
+  "pokemob.move.ice-hammer": "Eishammer",
+  "pokemob.move.floral-healing": "Florakur",
+  "pokemob.move.high-horsepower": "Pferdestärke",
+  "pokemob.move.strength-sap": "Kraftabsorber",
+  "pokemob.move.solar-blade": "Solarklinge",
+  "pokemob.move.leafage": "Blattwerk",
+  "pokemob.move.spotlight": "Rampenlicht",
+  "pokemob.move.toxic-thread": "Giftfaden",
+  "pokemob.move.laser-focus": "Konzentration",
+  "pokemob.move.gear-up": "Hilfsmechanik",
+  "pokemob.move.throat-chop": "Neck Strike",
+  "pokemob.move.pollen-puff": "Pollenknödel",
+  "pokemob.move.anchor-shot": "Ankerschuss",
+  "pokemob.move.psychic-terrain": "Psychofeld",
+  "pokemob.move.lunge": "Anfallen",
+  "pokemob.move.fire-lash": "Feuerpeitsche",
+  "pokemob.move.power-trip": "Überheblichkeit",
+  "pokemob.move.burn-up": "Ausbrennen",
+  "pokemob.move.speed-swap": "Initiativetausch",
+  "pokemob.move.smart-strike": "Schmalhorn",
+  "pokemob.move.purify": "Läuterung",
+  "pokemob.move.revelation-dance": "Wecktanz",
+  "pokemob.move.core-enforcer": "Sanktionskern",
+  "pokemob.move.trop-kick": "Tropenkick",
+  "pokemob.move.instruct": "Kommando",
+  "pokemob.move.beak-blast": "Schnabelkanone",
+  "pokemob.move.clanging-scales": "Schuppenrasseln",
+  "pokemob.move.dragon-hammer": "Drachenhammer",
+  "pokemob.move.brutal-swing": "Wirbler",
+  "pokemob.move.aurora-veil": "Auroraschleier",
+  "pokemob.move.sinister-arrow-raid": "Schatten-Pfeilregen",
+  "pokemob.move.malicious-moonsault": "Hyper Dark Crusher",
+  "pokemob.move.oceanic-operetta": "Grandiose Meeressymphonie",
+  "pokemob.move.guardian-of-alola": "Alolas Wächter",
+  "pokemob.move.soul-stealing-7-star-strike": "Sternbild des Seelenraubes",
+  "pokemob.move.stoked-sparksurfer": "Blitz-Wellenritt",
+  "pokemob.move.pulverizing-pancake": "Schluss mit lustig",
+  "pokemob.move.extreme-evoboost": "Macht der Neun",
+  "pokemob.move.genesis-supernova": "Supernova des Ursprungs",
+  "pokemob.move.shell-trap": "Panzerfalle",
+  "pokemob.move.fleur-cannon": "Kanonenbouquet",
+  "pokemob.move.psychic-fangs": "Psychobeißer",
+  "pokemob.move.stomping-tantrum": "Fruststampfer",
+  "pokemob.move.shadow-bone": "Schattenknochen",
+  "pokemob.move.accelerock": "Turbofelsen",
+  "pokemob.move.liquidation": "Aquadurchstoß",
+  "pokemob.move.prismatic-laser": "Prisma-Laser",
+  "pokemob.move.spectral-thief": "Diebesschatten",
+  "pokemob.move.sunsteel-strike": "Stahlgestirn",
+  "pokemob.move.moongeist-beam": "Schattenstrahl",
+  "pokemob.move.tearful-look": "Tränendrüse",
+  "pokemob.move.zing-zap": "Elektropikser",
+  "pokemob.move.natures-madness": "Naturzorn",
+  "pokemob.move.multi-attack": "Multi-Angriff",
+  "pokemob.move.10-000-000-volt-thunderbolt": "Tausendfacher Donnerblitz",
+  "pokemob.move.mind-blown": "Knallkopf",
+  "pokemob.move.plasma-fists": "Plasmafäuste",
+  "pokemob.move.photon-geyser": "Photonen-Geysir",
+  "pokemob.move.light-that-burns-the-sky": "Licht des Erlöschens",
+  "pokemob.move.searing-sunraze-smash": "Schmetternde Sonnenwalze",
+  "pokemob.move.menacing-moonraze-maelstrom": "Geballter Mondlaser",
+  "pokemob.move.lets-snuggle-forever": "Herzliche Knuddelkloppe",
+  "pokemob.move.splintered-stormshards": "Fataler Steinregen",
+  "pokemob.move.clangorous-soulblaze": "Rasselnder Seelentanz",
+  "pokemob.move.zippy-zap": "Britzelturbo",
+  "pokemob.move.splishy-splash": "Plätschersurfer",
+  "pokemob.move.floaty-fall": "Schwebesturz",
+  "pokemob.move.pika-papow": "Pika-Flash",
+  "pokemob.move.bouncy-bubble": "Blubbsauger",
+  "pokemob.move.buzzy-buzz": "Knisterladung",
+  "pokemob.move.sizzly-slide": "Flackerbrand",
+  "pokemob.move.glitzy-glow": "Pulsieraura",
+  "pokemob.move.baddy-bad": "Quälzone",
+  "pokemob.move.sappy-seed": "Sprießbomben",
+  "pokemob.move.freezy-frost": "Klirrfrost",
+  "pokemob.move.sparkly-swirl": "Glitzersturm",
+  "pokemob.move.veevee-volley": "Evo-Crash",
+  "pokemob.move.double-iron-bash": "Panzerfäuste",
+  "pokemob.move.max-guard": "Dyna-Wall",
+  "pokemob.move.dynamax-cannon": "Dynamax-Kanone",
+  "pokemob.move.snipe-shot": "Präzisionsschuss",
+  "pokemob.move.jaw-lock": "Fesselbiss",
+  "pokemob.move.stuff-cheeks": "Backenstopfer",
+  "pokemob.move.no-retreat": "Finalformation",
+  "pokemob.move.tar-shot": "Teerschuss",
+  "pokemob.move.magic-powder": "Magiepuder",
+  "pokemob.move.dragon-darts": "Drachenpfeile",
+  "pokemob.move.teatime": "Teatime",
+  "pokemob.move.octolock": "Octoklammer",
+  "pokemob.move.bolt-beak": "Schockschnabel",
+  "pokemob.move.fishious-rend": "Kiemenbiss",
+  "pokemob.move.court-change": "Seitenwechsel",
+  "pokemob.move.max-flare": "Dyna-Brand",
+  "pokemob.move.max-flutterby": "Dyna-Schwarm",
+  "pokemob.move.max-lightning": "Dyna-Gewitter",
+  "pokemob.move.max-strike": "Dyna-Angriff",
+  "pokemob.move.max-knuckle": "Dyna-Faust",
+  "pokemob.move.max-phantasm": "Dyna-Spuk",
+  "pokemob.move.max-hailstorm": "Dyna-Frost",
+  "pokemob.move.max-ooze": "Dyna-Giftschwall",
+  "pokemob.move.max-geyser": "Dyna-Flut",
+  "pokemob.move.max-airstream": "Dyna-Düse",
+  "pokemob.move.max-starfall": "Dyna-Zauber",
+  "pokemob.move.max-wyrmwind": "Dyna-Wyrm",
+  "pokemob.move.max-mindstorm": "Dyna-Kinese",
+  "pokemob.move.max-rockfall": "Dyna-Brocken",
+  "pokemob.move.max-quake": "Dyna-Erdstoß",
+  "pokemob.move.max-darkness": "Dyna-Dunkel",
+  "pokemob.move.max-overgrowth": "Dyna-Flora",
+  "pokemob.move.max-steelspike": "Dyna-Stahlzacken",
+  "pokemob.move.clangorous-soul": "Seelentanz",
+  "pokemob.move.body-press": "Body Press",
+  "pokemob.move.decorate": "Verzierung",
+  "pokemob.move.drum-beating": "Trommelschläge",
+  "pokemob.move.snap-trap": "Fangeisen",
+  "pokemob.move.pyro-ball": "Feuerball",
+  "pokemob.move.behemoth-blade": "Gigantenhieb",
+  "pokemob.move.behemoth-bash": "Gigantenstoß",
+  "pokemob.move.aura-wheel": "Aura-Rad",
+  "pokemob.move.breaking-swipe": "Breitseite",
+  "pokemob.move.branch-poke": "Zweigstoß",
+  "pokemob.move.overdrive": "Overdrive",
+  "pokemob.move.apple-acid": "Apfelsäure",
+  "pokemob.move.grav-apple": "Gravitation",
+  "pokemob.move.spirit-break": "Seelenbruch",
+  "pokemob.move.strange-steam": "Wunderdampf",
+  "pokemob.move.life-dew": "Lebenstropfen",
+  "pokemob.move.obstruct": "Abblocker",
+  "pokemob.move.false-surrender": "Kniefalltrick",
+  "pokemob.move.meteor-assault": "Sternensturm",
+  "pokemob.move.eternabeam": "Unendynastrahlen",
+  "pokemob.move.steel-beam": "Stahlstrahl",
+  "pokemob.move.expanding-force": "Flächenmacht",
+  "pokemob.move.steel-roller": "Eisenwalze",
+  "pokemob.move.scale-shot": "Schuppenschuss",
+  "pokemob.move.meteor-beam": "Meteorstrahl",
+  "pokemob.move.shell-side-arm": "Muschelwaffe",
+  "pokemob.move.misty-explosion": "Nebelexplosion",
+  "pokemob.move.grassy-glide": "Grasrutsche",
+  "pokemob.move.rising-voltage": "Hochspannung",
+  "pokemob.move.terrain-pulse": "Feldimpuls",
+  "pokemob.move.skitter-smack": "Krabbelkracher",
+  "pokemob.move.burning-jealousy": "Neidflammen",
+  "pokemob.move.lash-out": "Frustventil",
+  "pokemob.move.poltergeist": "Poltergeist",
+  "pokemob.move.corrosive-gas": "Korrosionsgas",
+  "pokemob.move.coaching": "Coaching",
+  "pokemob.move.flip-turn": "Rollwende",
+  "pokemob.move.triple-axel": "Dreifach-Axel",
+  "pokemob.move.dual-wingbeat": "Doppelflügel",
+  "pokemob.move.scorching-sands": "Brandsand",
+  "pokemob.move.jungle-healing": "Dschungelheilung",
+  "pokemob.move.wicked-blow": "Finstertreffer",
+  "pokemob.move.surging-strikes": "Trefferschwall",
+  "pokemob.move.thunder-cage": "Blitzgefängnis",
+  "pokemob.move.dragon-energy": "Drachenkräfte",
+  "pokemob.move.freezing-glare": "Eisiger Blick",
+  "pokemob.move.fiery-wrath": "Brennender Zorn",
+  "pokemob.move.thunderous-kick": "Donnernder Tritt",
+  "pokemob.move.glacial-lance": "Blizzardlanze",
+  "pokemob.move.astral-barrage": "Astralfragmente",
+  "pokemob.move.eerie-spell": "Schauderspruch",
+  "pokemob.move.shadow-rush": "Cryptoschlag",
+  "pokemob.move.shadow-blast": "Cryptostrahl",
+  "pokemob.move.shadow-blitz": "Cryptoknall",
+  "pokemob.move.shadow-bolt": "Cryptoblitz",
+  "pokemob.move.shadow-break": "Cryptohieb",
+  "pokemob.move.shadow-chill": "Cryptofrost",
+  "pokemob.move.shadow-end": "Cryptoretour",
+  "pokemob.move.shadow-fire": "Cryptofeuer",
+  "pokemob.move.shadow-rave": "Cryptobeben",
+  "pokemob.move.shadow-storm": "Cryptosturm",
+  "pokemob.move.shadow-wave": "Cryptowelle",
+  "pokemob.move.shadow-down": "Cryptobann",
+  "pokemob.move.shadow-half": "Cryptozorn",
+  "pokemob.move.shadow-hold": "Cryptofessel",
+  "pokemob.move.shadow-mist": "Cryptodunst",
+  "pokemob.move.shadow-panic": "Cryptochaos",
+  "pokemob.move.shadow-shed": "Cryptobruch",
+  "pokemob.move.shadow-sky": "Cryptowetter"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/en_US.lang b/src/main/resources/assets/pokecube_moves/lang/en_US.lang
deleted file mode 100644
index 3264efab7f..0000000000
--- a/src/main/resources/assets/pokecube_moves/lang/en_US.lang
+++ /dev/null
@@ -1,763 +0,0 @@
-#Pokecube translation
-
-##Move Messages
-
-pokemob.move.super.effective=It's super effective!
-pokemob.move.not.very.effective=It's not very effective!
-pokemob.move.doesnt.affect=It doesn't affect %1$s!
-pokemob.move.critical.hit=Critical hit!
-pokemob.move.used=%1$s used %2$s!
-pokemob.move.enemyUsed=%1$s enemy used %2$s!
-pokemob.move.stat.fail=But it failed
-pokemob.move.stat.rise1=%1$s's %2$s rose
-pokemob.move.stat.rise2=%1$s's %2$s sharply rose
-pokemob.move.stat.rise3=%1$s's %2$s drastically rose
-pokemob.move.stat.fall1=%1$s's %2$s fell
-pokemob.move.stat.fall2=%1$s's %2$s harshly fell
-pokemob.move.stat.fall3=%1$s's %2$s drastically fell
-
-pokemob.move.stat1=Attack
-pokemob.move.stat2=Defense
-pokemob.move.stat3=Special Attack
-pokemob.move.stat4=Special Defense
-pokemob.move.stat5=Speed
-pokemob.move.stat6=Accuracy
-pokemob.move.stat7=Evasion
-
-pokemob.move.notify.learn=%1$s Learned %2$s
-pokemob.move.terraindamage=%1$s was hurt by the %2$s
-
-pokemob.move.missed.ours=§cIt missed %1$s!
-pokemob.move.missed.theirs=§aIt missed %1$s!
-
-pokemob.move.failed.ours=%1$s's §cattack failed!
-pokemob.move.failed.theirs=%1$s's §aattack failed!
-
-pokemob.move.isfrozen=%1$s is frozen.
-pokemob.move.issleeping=%1$s is sleeping.
-pokemob.move.isfullyparalyzed=%1$s is fully paralyzed.
-pokemob.move.paralyzed=%1$s is paralyzed.
-pokemob.move.isburned=%1$s is burned.
-pokemob.move.ispoisoned=%1$s is poisoned.
-pokemob.move.isbadlypoisoned=%1$s is badly poisoned.
-
-pokemob.move.sketched=%1$s Sketched %2$s
-
-pokemob.move.cooldown=%1$s §ccannot use %2$s §cright now.
-
-##Move Names
-pokemob.move.10000000voltthunderbolt=10,000,000 Volt Thunderbolt
-pokemob.move.absorb=Absorb
-pokemob.move.accelerock=Accelerock
-pokemob.move.acid=Acid
-pokemob.move.acidarmor=Acid Armor
-pokemob.move.aciddownpour=Acid Downpour
-pokemob.move.acidspray=Acid Spray
-pokemob.move.acrobatics=Acrobatics
-pokemob.move.acupressure=Acupressure
-pokemob.move.aerialace=Aerial Ace
-pokemob.move.aeroblast=Aeroblast
-pokemob.move.afteryou=After You
-pokemob.move.agility=Agility
-pokemob.move.aircutter=Air Cutter
-pokemob.move.airslash=Air Slash
-pokemob.move.alloutpummeling=All-Out Pummeling
-pokemob.move.allyswitch=Ally Switch
-pokemob.move.amnesia=Amnesia
-pokemob.move.anchorshot=Anchor Shot
-pokemob.move.ancientpower=Ancient Power
-pokemob.move.aquajet=Aqua Jet
-pokemob.move.aquaring=Aqua Ring
-pokemob.move.aquatail=Aqua Tail
-pokemob.move.armthrust=Arm Thrust
-pokemob.move.aromatherapy=Aromatherapy
-pokemob.move.aromaticmist=Aromatic Mist
-pokemob.move.assist=Assist
-pokemob.move.assurance=Assurance
-pokemob.move.astonish=Astonish
-pokemob.move.attackorder=Attack Order
-pokemob.move.attract=Attract
-pokemob.move.aurasphere=Aura Sphere
-pokemob.move.aurorabeam=Aurora Beam
-pokemob.move.auroraveil=Aurora Veil
-pokemob.move.autotomize=Autotomize
-pokemob.move.avalanche=Avalanche
-pokemob.move.babydolleyes=Baby-Doll Eyes
-pokemob.move.banefulbunker=Baneful Bunker
-pokemob.move.barrage=Barrage
-pokemob.move.barrier=Barrier
-pokemob.move.batonpass=Baton Pass
-pokemob.move.beakblast=Beak Blast
-pokemob.move.beatup=Beat Up
-pokemob.move.belch=Belch
-pokemob.move.bellydrum=Belly Drum
-pokemob.move.bestow=Bestow
-pokemob.move.bide=Bide
-pokemob.move.bind=Bind
-pokemob.move.bite=Bite
-pokemob.move.blackholeeclipse=Black Hole Eclipse
-pokemob.move.blastburn=Blast Burn
-pokemob.move.blazekick=Blaze Kick
-pokemob.move.blizzard=Blizzard
-pokemob.move.block=Block
-pokemob.move.bloomdoom=Bloom Doom
-pokemob.move.blueflare=Blue Flare
-pokemob.move.bodyslam=Body Slam
-pokemob.move.boltstrike=Bolt Strike
-pokemob.move.boneclub=Bone Club
-pokemob.move.bonemerang=Bonemerang
-pokemob.move.bonerush=Bone Rush
-pokemob.move.boomburst=Boomburst
-pokemob.move.bounce=Bounce
-pokemob.move.bravebird=Brave Bird
-pokemob.move.breakneckblitz=Breakneck Blitz
-pokemob.move.brickbreak=Brick Break
-pokemob.move.brine=Brine
-pokemob.move.brutalswing=Brutal Swing
-pokemob.move.bubble=Bubble
-pokemob.move.bubblebeam=Bubble Beam
-pokemob.move.bugbite=Bug Bite
-pokemob.move.bugbuzz=Bug Buzz
-pokemob.move.bulkup=Bulk Up
-pokemob.move.bulldoze=Bulldoze
-pokemob.move.bulletpunch=Bullet Punch
-pokemob.move.bulletseed=Bullet Seed
-pokemob.move.burnup=Burn Up
-pokemob.move.calmmind=Calm Mind
-pokemob.move.camouflage=Camouflage
-pokemob.move.captivate=Captivate
-pokemob.move.catastropika=Catastropika
-pokemob.move.celebrate=Celebrate
-pokemob.move.charge=Charge
-pokemob.move.chargebeam=Charge Beam
-pokemob.move.charm=Charm
-pokemob.move.chatter=Chatter
-pokemob.move.chipaway=Chip Away
-pokemob.move.circlethrow=Circle Throw
-pokemob.move.clamp=Clamp
-pokemob.move.clangingscales=Clanging Scales
-pokemob.move.clearsmog=Clear Smog
-pokemob.move.closecombat=Close Combat
-pokemob.move.coil=Coil
-pokemob.move.cometpunch=Comet Punch
-pokemob.move.confide=Confide
-pokemob.move.confuseray=Confuse Ray
-pokemob.move.confusion=Confusion
-pokemob.move.constrict=Constrict
-pokemob.move.continentalcrush=Continental Crush
-pokemob.move.conversion=Conversion
-pokemob.move.conversion2=Conversion 2
-pokemob.move.copycat=Copycat
-pokemob.move.coreenforcer=Core Enforcer
-pokemob.move.corkscrewcrash=Corkscrew Crash
-pokemob.move.cosmicpower=Cosmic Power
-pokemob.move.cottonguard=Cotton Guard
-pokemob.move.cottonspore=Cotton Spore
-pokemob.move.counter=Counter
-pokemob.move.covet=Covet
-pokemob.move.crabhammer=Crabhammer
-pokemob.move.craftyshield=Crafty Shield
-pokemob.move.crosschop=Cross Chop
-pokemob.move.crosspoison=Cross Poison
-pokemob.move.crunch=Crunch
-pokemob.move.crushclaw=Crush Claw
-pokemob.move.crushgrip=Crush Grip
-pokemob.move.curse=Curse
-pokemob.move.cut=Cut
-pokemob.move.darkestlariat=Darkest Lariat
-pokemob.move.darkpulse=Dark Pulse
-pokemob.move.darkvoid=Dark Void
-pokemob.move.dazzlinggleam=Dazzling Gleam
-pokemob.move.defendorder=Defend Order
-pokemob.move.defensecurl=Defense Curl
-pokemob.move.defog=Defog
-pokemob.move.destinybond=Destiny Bond
-pokemob.move.detect=Detect
-pokemob.move.devastatingdrake=Devastating Drake
-pokemob.move.diamondstorm=Diamond Storm
-pokemob.move.dig=Dig
-pokemob.move.disable=Disable
-pokemob.move.disarmingvoice=Disarming Voice
-pokemob.move.discharge=Discharge
-pokemob.move.dive=Dive
-pokemob.move.dizzypunch=Dizzy Punch
-pokemob.move.doomdesire=Doom Desire
-pokemob.move.doubleedge=Double-Edge
-pokemob.move.doubleironbash=Double Iron Bash
-pokemob.move.doublehit=Double Hit
-pokemob.move.doublekick=Double Kick
-pokemob.move.doubleslap=Double Slap
-pokemob.move.doubleteam=Double Team
-pokemob.move.dracometeor=Draco Meteor
-pokemob.move.dragonascent=Dragon Ascent
-pokemob.move.dragonbreath=Dragon Breath
-pokemob.move.dragonclaw=Dragon Claw
-pokemob.move.dragondance=Dragon Dance
-pokemob.move.dragonhammer=Dragon Hammer
-pokemob.move.dragonpulse=Dragon Pulse
-pokemob.move.dragonrage=Dragon Rage
-pokemob.move.dragonrush=Dragon Rush
-pokemob.move.dragontail=Dragon Tail
-pokemob.move.drainingkiss=Draining Kiss
-pokemob.move.drainpunch=Drain Punch
-pokemob.move.dreameater=Dream Eater
-pokemob.move.drillpeck=Drill Peck
-pokemob.move.drillrun=Drill Run
-pokemob.move.dualchop=Dual Chop
-pokemob.move.dynamicpunch=Dynamic Punch
-pokemob.move.earthpower=Earth Power
-pokemob.move.earthquake=Earthquake
-pokemob.move.echoedvoice=Echoed Voice
-pokemob.move.eerieimpulse=Eerie Impulse
-pokemob.move.eggbomb=Egg Bomb
-pokemob.move.electricterrain=Electric Terrain
-pokemob.move.electrify=Electrify
-pokemob.move.electroball=Electro Ball
-pokemob.move.electroweb=Electroweb
-pokemob.move.embargo=Embargo
-pokemob.move.ember=Ember
-pokemob.move.encore=Encore
-pokemob.move.endeavor=Endeavor
-pokemob.move.endure=Endure
-pokemob.move.energyball=Energy Ball
-pokemob.move.entrainment=Entrainment
-pokemob.move.eruption=Eruption
-pokemob.move.explosion=Explosion
-pokemob.move.extrasensory=Extrasensory
-pokemob.move.extremeevoboost=Extreme Evoboost
-pokemob.move.extremespeed=Extreme Speed
-pokemob.move.facade=Facade
-pokemob.move.fairylock=Fairy Lock
-pokemob.move.fairywind=Fairy Wind
-pokemob.move.fakeout=Fake Out
-pokemob.move.faketears=Fake Tears
-pokemob.move.falseswipe=False Swipe
-pokemob.move.featherdance=Feather Dance
-pokemob.move.feint=Feint
-pokemob.move.feintattack=Feint Attack
-pokemob.move.fellstinger=Fell Stinger
-pokemob.move.fierydance=Fiery Dance
-pokemob.move.finalgambit=Final Gambit
-pokemob.move.fireblast=Fire Blast
-pokemob.move.firefang=Fire Fang
-pokemob.move.firelash=Fire Lash
-pokemob.move.firepledge=Fire Pledge
-pokemob.move.firepunch=Fire Punch
-pokemob.move.firespin=Fire Spin
-pokemob.move.firstimpression=First Impression
-pokemob.move.fissure=Fissure
-pokemob.move.flail=Flail
-pokemob.move.flameburst=Flame Burst
-pokemob.move.flamecharge=Flame Charge
-pokemob.move.flamethrower=Flamethrower
-pokemob.move.flamewheel=Flame Wheel
-pokemob.move.flareblitz=Flare Blitz
-pokemob.move.flash=Flash
-pokemob.move.flashcannon=Flash Cannon
-pokemob.move.flatter=Flatter
-pokemob.move.fleurcannon=Fleur Cannon
-pokemob.move.fling=Fling
-pokemob.move.floralhealing=Floral Healing
-pokemob.move.flowershield=Flower Shield
-pokemob.move.fly=Fly
-pokemob.move.flyingpress=Flying Press
-pokemob.move.focusblast=Focus Blast
-pokemob.move.focusenergy=Focus Energy
-pokemob.move.focuspunch=Focus Punch
-pokemob.move.followme=Follow Me
-pokemob.move.forcepalm=Force Palm
-pokemob.move.foresight=Foresight
-pokemob.move.forestscurse=Forest’s Curse
-pokemob.move.foulplay=Foul Play
-pokemob.move.freezedry=Freeze-Dry
-pokemob.move.freezeshock=Freeze Shock
-pokemob.move.frenzyplant=Frenzy Plant
-pokemob.move.frostbreath=Frost Breath
-pokemob.move.frustration=Frustration
-pokemob.move.furyattack=Fury Attack
-pokemob.move.furycutter=Fury Cutter
-pokemob.move.furyswipes=Fury Swipes
-pokemob.move.fusionbolt=Fusion Bolt
-pokemob.move.fusionflare=Fusion Flare
-pokemob.move.futuresight=Future Sight
-pokemob.move.gastroacid=Gastro Acid
-pokemob.move.geargrind=Gear Grind
-pokemob.move.gearup=Gear Up
-pokemob.move.genesissupernova=Genesis Supernova
-pokemob.move.geomancy=Geomancy
-pokemob.move.gigadrain=Giga Drain
-pokemob.move.gigaimpact=Giga Impact
-pokemob.move.gigavolthavoc=Gigavolt Havoc
-pokemob.move.glaciate=Glaciate
-pokemob.move.glare=Glare
-pokemob.move.grassknot=Grass Knot
-pokemob.move.grasspledge=Grass Pledge
-pokemob.move.grasswhistle=Grass Whistle
-pokemob.move.grassyterrain=Grassy Terrain
-pokemob.move.gravity=Gravity
-pokemob.move.growl=Growl
-pokemob.move.growth=Growth
-pokemob.move.grudge=Grudge
-pokemob.move.guardianofalola=Guardian of Alola
-pokemob.move.guardsplit=Guard Split
-pokemob.move.guardswap=Guard Swap
-pokemob.move.guillotine=Guillotine
-pokemob.move.gunkshot=Gunk Shot
-pokemob.move.gust=Gust
-pokemob.move.gyroball=Gyro Ball
-pokemob.move.hail=Hail
-pokemob.move.hammerarm=Hammer Arm
-pokemob.move.happyhour=Happy Hour
-pokemob.move.harden=Harden
-pokemob.move.haze=Haze
-pokemob.move.headbutt=Headbutt
-pokemob.move.headcharge=Head Charge
-pokemob.move.headsmash=Head Smash
-pokemob.move.healbell=Heal Bell
-pokemob.move.healblock=Heal Block
-pokemob.move.healingwish=Healing Wish
-pokemob.move.healorder=Heal Order
-pokemob.move.healpulse=Heal Pulse
-pokemob.move.heartstamp=Heart Stamp
-pokemob.move.heartswap=Heart Swap
-pokemob.move.heatcrash=Heat Crash
-pokemob.move.heatwave=Heat Wave
-pokemob.move.heavyslam=Heavy Slam
-pokemob.move.helpinghand=Helping Hand
-pokemob.move.hex=Hex
-pokemob.move.hiddenpower=Hidden Power
-pokemob.move.highhorsepower=High Horsepower
-pokemob.move.highjumpkick=High Jump Kick
-pokemob.move.holdback=Hold Back
-pokemob.move.holdhands=Hold Hands
-pokemob.move.honeclaws=Hone Claws
-pokemob.move.hornattack=Horn Attack
-pokemob.move.horndrill=Horn Drill
-pokemob.move.hornleech=Horn Leech
-pokemob.move.howl=Howl
-pokemob.move.hurricane=Hurricane
-pokemob.move.hydrocannon=Hydro Cannon
-pokemob.move.hydropump=Hydro Pump
-pokemob.move.hydrovortex=Hydro Vortex
-pokemob.move.hyperbeam=Hyper Beam
-pokemob.move.hyperfang=Hyper Fang
-pokemob.move.hyperspacefury=Hyperspace Fury
-pokemob.move.hyperspacehole=Hyperspace Hole
-pokemob.move.hypervoice=Hyper Voice
-pokemob.move.hypnosis=Hypnosis
-pokemob.move.iceball=Ice Ball
-pokemob.move.icebeam=Ice Beam
-pokemob.move.iceburn=Ice Burn
-pokemob.move.icefang=Ice Fang
-pokemob.move.icehammer=Ice Hammer
-pokemob.move.icepunch=Ice Punch
-pokemob.move.iceshard=Ice Shard
-pokemob.move.iciclecrash=Icicle Crash
-pokemob.move.iciclespear=Icicle Spear
-pokemob.move.icywind=Icy Wind
-pokemob.move.imprison=Imprison
-pokemob.move.incinerate=Incinerate
-pokemob.move.inferno=Inferno
-pokemob.move.infernooverdrive=Inferno Overdrive
-pokemob.move.infestation=Infestation
-pokemob.move.ingrain=Ingrain
-pokemob.move.instruct=Instruct
-pokemob.move.iondeluge=Ion Deluge
-pokemob.move.irondefense=Iron Defense
-pokemob.move.ironhead=Iron Head
-pokemob.move.irontail=Iron Tail
-pokemob.move.judgment=Judgment
-pokemob.move.jumpkick=Jump Kick
-pokemob.move.karatechop=Karate Chop
-pokemob.move.kinesis=Kinesis
-pokemob.move.kingsshield=King’s Shield
-pokemob.move.knockoff=Knock Off
-pokemob.move.landswrath=Land’s Wrath
-pokemob.move.laserfocus=Laser Focus
-pokemob.move.lastresort=Last Resort
-pokemob.move.lavaplume=Lava Plume
-pokemob.move.leafage=Leafage
-pokemob.move.leafblade=Leaf Blade
-pokemob.move.leafstorm=Leaf Storm
-pokemob.move.leaftornado=Leaf Tornado
-pokemob.move.leechlife=Leech Life
-pokemob.move.leechseed=Leech Seed
-pokemob.move.leer=Leer
-pokemob.move.lick=Lick
-pokemob.move.lightofruin=Light of Ruin
-pokemob.move.lightscreen=Light Screen
-pokemob.move.liquidation=Liquidation
-pokemob.move.lockon=Lock-On
-pokemob.move.lovelykiss=Lovely Kiss
-pokemob.move.lowkick=Low Kick
-pokemob.move.lowsweep=Low Sweep
-pokemob.move.luckychant=Lucky Chant
-pokemob.move.lunardance=Lunar Dance
-pokemob.move.lunge=Lunge
-pokemob.move.lusterpurge=Luster Purge
-pokemob.move.machpunch=Mach Punch
-pokemob.move.magicalleaf=Magical Leaf
-pokemob.move.magiccoat=Magic Coat
-pokemob.move.magicroom=Magic Room
-pokemob.move.magmastorm=Magma Storm
-pokemob.move.magnetbomb=Magnet Bomb
-pokemob.move.magneticflux=Magnetic Flux
-pokemob.move.magnetrise=Magnet Rise
-pokemob.move.magnitude=Magnitude
-pokemob.move.maliciousmoonsault=Malicious Moonsault
-pokemob.move.matblock=Mat Block
-pokemob.move.meanlook=Mean Look
-pokemob.move.meditate=Meditate
-pokemob.move.mefirst=Me First
-pokemob.move.megadrain=Mega Drain
-pokemob.move.megahorn=Megahorn
-pokemob.move.megakick=Mega Kick
-pokemob.move.megapunch=Mega Punch
-pokemob.move.memento=Memento
-pokemob.move.metalburst=Metal Burst
-pokemob.move.metalclaw=Metal Claw
-pokemob.move.metalsound=Metal Sound
-pokemob.move.meteormash=Meteor Mash
-pokemob.move.metronome=Metronome
-pokemob.move.milkdrink=Milk Drink
-pokemob.move.mimic=Mimic
-pokemob.move.mindreader=Mind Reader
-pokemob.move.minimize=Minimize
-pokemob.move.miracleeye=Miracle Eye
-pokemob.move.mirrorcoat=Mirror Coat
-pokemob.move.mirrormove=Mirror Move
-pokemob.move.mirrorshot=Mirror Shot
-pokemob.move.mist=Mist
-pokemob.move.mistball=Mist Ball
-pokemob.move.mistyterrain=Misty Terrain
-pokemob.move.moonblast=Moonblast
-pokemob.move.moongeistbeam=Moongeist Beam
-pokemob.move.moonlight=Moonlight
-pokemob.move.morningsun=Morning Sun
-pokemob.move.mudbomb=Mud Bomb
-pokemob.move.muddywater=Muddy Water
-pokemob.move.mudshot=Mud Shot
-pokemob.move.mudslap=Mud-Slap
-pokemob.move.mudsport=Mud Sport
-pokemob.move.multiattack=Multi-Attack
-pokemob.move.mysticalfire=Mystical Fire
-pokemob.move.nastyplot=Nasty Plot
-pokemob.move.naturalgift=Natural Gift
-pokemob.move.naturepower=Nature Power
-pokemob.move.naturesmadness=Nature's Madness
-pokemob.move.needlearm=Needle Arm
-pokemob.move.neverendingnightmare=Never-Ending Nightmare
-pokemob.move.nightdaze=Night Daze
-pokemob.move.nightmare=Nightmare
-pokemob.move.nightshade=Night Shade
-pokemob.move.nightslash=Night Slash
-pokemob.move.nobleroar=Noble Roar
-pokemob.move.nuzzle=Nuzzle
-pokemob.move.oblivionwing=Oblivion Wing
-pokemob.move.oceanicoperetta=Oceanic Operetta
-pokemob.move.octazooka=Octazooka
-pokemob.move.odorsleuth=Odor Sleuth
-pokemob.move.ominouswind=Ominous Wind
-pokemob.move.originpulse=Origin Pulse
-pokemob.move.outrage=Outrage
-pokemob.move.overheat=Overheat
-pokemob.move.painsplit=Pain Split
-pokemob.move.paraboliccharge=Parabolic Charge
-pokemob.move.partingshot=Parting Shot
-pokemob.move.payback=Payback
-pokemob.move.payday=Pay Day
-pokemob.move.peck=Peck
-pokemob.move.perishsong=Perish Song
-pokemob.move.petalblizzard=Petal Blizzard
-pokemob.move.petaldance=Petal Dance
-pokemob.move.phantomforce=Phantom Force
-pokemob.move.pinmissile=Pin Missile
-pokemob.move.playnice=Play Nice
-pokemob.move.playrough=Play Rough
-pokemob.move.pluck=Pluck
-pokemob.move.poisonfang=Poison Fang
-pokemob.move.poisongas=Poison Gas
-pokemob.move.poisonjab=Poison Jab
-pokemob.move.poisonpowder=Poison Powder
-pokemob.move.poisonsting=Poison Sting
-pokemob.move.poisontail=Poison Tail
-pokemob.move.pollenpuff=Pollen Puff
-pokemob.move.pound=Pound
-pokemob.move.powder=Powder
-pokemob.move.powdersnow=Powder Snow
-pokemob.move.powergem=Power Gem
-pokemob.move.powersplit=Power Split
-pokemob.move.powerswap=Power Swap
-pokemob.move.powertrick=Power Trick
-pokemob.move.powertrip=Power Trip
-pokemob.move.poweruppunch=Power-Up Punch
-pokemob.move.powerwhip=Power Whip
-pokemob.move.precipiceblades=Precipice Blades
-pokemob.move.present=Present
-pokemob.move.prismaticlaser=Prismatic Laser
-pokemob.move.protect=Protect
-pokemob.move.psybeam=Psybeam
-pokemob.move.psychic=Psychic
-pokemob.move.psychicfangs=Psychic Fangs
-pokemob.move.psychicterrain=Psychic Terrain
-pokemob.move.psychoboost=Psycho Boost
-pokemob.move.psychocut=Psycho Cut
-pokemob.move.psychoshift=Psycho Shift
-pokemob.move.psychup=Psych Up
-pokemob.move.psyshock=Psyshock
-pokemob.move.psystrike=Psystrike
-pokemob.move.psywave=Psywave
-pokemob.move.pulverizingpancake=Pulverizing Pancake
-pokemob.move.punishment=Punishment
-pokemob.move.purify=Purify
-pokemob.move.pursuit=Pursuit
-pokemob.move.quash=Quash
-pokemob.move.quickattack=Quick Attack
-pokemob.move.quickguard=Quick Guard
-pokemob.move.quiverdance=Quiver Dance
-pokemob.move.rage=Rage
-pokemob.move.ragepowder=Rage Powder
-pokemob.move.raindance=Rain Dance
-pokemob.move.rapidspin=Rapid Spin
-pokemob.move.razorleaf=Razor Leaf
-pokemob.move.razorshell=Razor Shell
-pokemob.move.razorwind=Razor Wind
-pokemob.move.recover=Recover
-pokemob.move.recycle=Recycle
-pokemob.move.reflect=Reflect
-pokemob.move.reflecttype=Reflect Type
-pokemob.move.refresh=Refresh
-pokemob.move.relicsong=Relic Song
-pokemob.move.rest=Rest
-pokemob.move.retaliate=Retaliate
-pokemob.move.return=Return
-pokemob.move.revelationdance=Revelation Dance
-pokemob.move.revenge=Revenge
-pokemob.move.reversal=Reversal
-pokemob.move.roar=Roar
-pokemob.move.roaroftime=Roar of Time
-pokemob.move.rockblast=Rock Blast
-pokemob.move.rockclimb=Rock Climb
-pokemob.move.rockpolish=Rock Polish
-pokemob.move.rockslide=Rock Slide
-pokemob.move.rocksmash=Rock Smash
-pokemob.move.rockthrow=Rock Throw
-pokemob.move.rocktomb=Rock Tomb
-pokemob.move.rockwrecker=Rock Wrecker
-pokemob.move.roleplay=Role Play
-pokemob.move.rollingkick=Rolling Kick
-pokemob.move.rollout=Rollout
-pokemob.move.roost=Roost
-pokemob.move.rototiller=Rototiller
-pokemob.move.round=Round
-pokemob.move.sacredfire=Sacred Fire
-pokemob.move.sacredsword=Sacred Sword
-pokemob.move.safeguard=Safeguard
-pokemob.move.sandattack=Sand Attack
-pokemob.move.sandstorm=Sandstorm
-pokemob.move.sandtomb=Sand Tomb
-pokemob.move.savagespinout=Savage Spin-Out
-pokemob.move.scald=Scald
-pokemob.move.scaryface=Scary Face
-pokemob.move.scratch=Scratch
-pokemob.move.screech=Screech
-pokemob.move.searingshot=Searing Shot
-pokemob.move.secretpower=Secret Power
-pokemob.move.secretsword=Secret Sword
-pokemob.move.seedbomb=Seed Bomb
-pokemob.move.seedflare=Seed Flare
-pokemob.move.seismictoss=Seismic Toss
-pokemob.move.selfdestruct=Self-Destruct
-pokemob.move.shadowball=Shadow Ball
-pokemob.move.shadowbone=Shadow Bone
-pokemob.move.shadowclaw=Shadow Claw
-pokemob.move.shadowforce=Shadow Force
-pokemob.move.shadowpunch=Shadow Punch
-pokemob.move.shadowsneak=Shadow Sneak
-pokemob.move.sharpen=Sharpen
-pokemob.move.shatteredpsyche=Shattered Psyche
-pokemob.move.sheercold=Sheer Cold
-pokemob.move.shellsmash=Shell Smash
-pokemob.move.shelltrap=Shell Trap
-pokemob.move.shiftgear=Shift Gear
-pokemob.move.shockwave=Shock Wave
-pokemob.move.shoreup=Shore Up
-pokemob.move.signalbeam=Signal Beam
-pokemob.move.silverwind=Silver Wind
-pokemob.move.simplebeam=Simple Beam
-pokemob.move.sing=Sing
-pokemob.move.sinisterarrowraid=Sinister Arrow Raid
-pokemob.move.sketch=Sketch
-pokemob.move.skillswap=Skill Swap
-pokemob.move.skullbash=Skull Bash
-pokemob.move.skyattack=Sky Attack
-pokemob.move.skydrop=Sky Drop
-pokemob.move.skyuppercut=Sky Uppercut
-pokemob.move.slackoff=Slack Off
-pokemob.move.slam=Slam
-pokemob.move.slash=Slash
-pokemob.move.sleeppowder=Sleep Powder
-pokemob.move.sleeptalk=Sleep Talk
-pokemob.move.sludge=Sludge
-pokemob.move.sludgebomb=Sludge Bomb
-pokemob.move.sludgewave=Sludge Wave
-pokemob.move.smackdown=Smack Down
-pokemob.move.smartstrike=Smart Strike
-pokemob.move.smellingsalts=Smelling Salts
-pokemob.move.smog=Smog
-pokemob.move.smokescreen=Smokescreen
-pokemob.move.snarl=Snarl
-pokemob.move.snatch=Snatch
-pokemob.move.snore=Snore
-pokemob.move.soak=Soak
-pokemob.move.softboiled=Soft-Boiled
-pokemob.move.solarbeam=Solar Beam
-pokemob.move.solarblade=Solar Blade
-pokemob.move.sonicboom=Sonic Boom
-pokemob.move.soulstealing7starstrike=Soul-Stealing 7-Star Strike
-pokemob.move.spacialrend=Spacial Rend
-pokemob.move.spark=Spark
-pokemob.move.sparklingaria=Sparkling Aria
-pokemob.move.spectralthief=Spectral Thief
-pokemob.move.speedswap=Speed Swap
-pokemob.move.spiderweb=Spider Web
-pokemob.move.spikecannon=Spike Cannon
-pokemob.move.spikes=Spikes
-pokemob.move.spikyshield=Spiky Shield
-pokemob.move.spiritshackle=Spirit Shackle
-pokemob.move.spite=Spite
-pokemob.move.spitup=Spit Up
-pokemob.move.splash=Splash
-pokemob.move.spore=Spore
-pokemob.move.spotlight=Spotlight
-pokemob.move.stealthrock=Stealth Rock
-pokemob.move.steameruption=Steam Eruption
-pokemob.move.steamroller=Steamroller
-pokemob.move.steelwing=Steel Wing
-pokemob.move.stickyweb=Sticky Web
-pokemob.move.stockpile=Stockpile
-pokemob.move.stokedsparksurfer=Stoked Sparksurfer
-pokemob.move.stomp=Stomp
-pokemob.move.stompingtantrum=Stomping Tantrum
-pokemob.move.stoneedge=Stone Edge
-pokemob.move.storedpower=Stored Power
-pokemob.move.stormthrow=Storm Throw
-pokemob.move.strength=Strength
-pokemob.move.strengthsap=Strength Sap
-pokemob.move.stringshot=String Shot
-pokemob.move.struggle=Struggle
-pokemob.move.strugglebug=Struggle Bug
-pokemob.move.stunspore=Stun Spore
-pokemob.move.submission=Submission
-pokemob.move.substitute=Substitute
-pokemob.move.subzeroslammer=Subzero Slammer
-pokemob.move.suckerpunch=Sucker Punch
-pokemob.move.sunnyday=Sunny Day
-pokemob.move.sunsteelstrike=Sunsteel Strike
-pokemob.move.superfang=Super Fang
-pokemob.move.superpower=Superpower
-pokemob.move.supersonic=Supersonic
-pokemob.move.supersonicskystrike=Supersonic Skystrike
-pokemob.move.surf=Surf
-pokemob.move.swagger=Swagger
-pokemob.move.swallow=Swallow
-pokemob.move.sweetkiss=Sweet Kiss
-pokemob.move.sweetscent=Sweet Scent
-pokemob.move.swift=Swift
-pokemob.move.switcheroo=Switcheroo
-pokemob.move.swordsdance=Swords Dance
-pokemob.move.synchronoise=Synchronoise
-pokemob.move.synthesis=Synthesis
-pokemob.move.tackle=Tackle
-pokemob.move.tailglow=Tail Glow
-pokemob.move.tailslap=Tail Slap
-pokemob.move.tailwhip=Tail Whip
-pokemob.move.tailwind=Tailwind
-pokemob.move.takedown=Take Down
-pokemob.move.taunt=Taunt
-pokemob.move.tearfullook=Tearful Look
-pokemob.move.technoblast=Techno Blast
-pokemob.move.tectonicrage=Tectonic Rage
-pokemob.move.teeterdance=Teeter Dance
-pokemob.move.telekinesis=Telekinesis
-pokemob.move.teleport=Teleport
-pokemob.move.thief=Thief
-pokemob.move.thousandarrows=Thousand Arrows
-pokemob.move.thousandwaves=Thousand Waves
-pokemob.move.thrash=Thrash
-pokemob.move.throatchop=Throat Chop
-pokemob.move.thunder=Thunder
-pokemob.move.thunderbolt=Thunderbolt
-pokemob.move.thunderfang=Thunder Fang
-pokemob.move.thunderpunch=Thunder Punch
-pokemob.move.thundershock=Thunder Shock
-pokemob.move.thunderwave=Thunder Wave
-pokemob.move.tickle=Tickle
-pokemob.move.topsyturvy=Topsy-Turvy
-pokemob.move.torment=Torment
-pokemob.move.toxic=Toxic
-pokemob.move.toxicspikes=Toxic Spikes
-pokemob.move.toxicthread=Toxic Thread
-pokemob.move.transform=Transform
-pokemob.move.triattack=Tri Attack
-pokemob.move.trick=Trick
-pokemob.move.trickortreat=Trick-or-Treat
-pokemob.move.trickroom=Trick Room
-pokemob.move.triplekick=Triple Kick
-pokemob.move.tropkick=Trop Kick
-pokemob.move.trumpcard=Trump Card
-pokemob.move.twineedle=Twineedle
-pokemob.move.twinkletackle=Twinkle Tackle
-pokemob.move.twister=Twister
-pokemob.move.uproar=Uproar
-pokemob.move.uturn=U-turn
-pokemob.move.vacuumwave=Vacuum Wave
-pokemob.move.vcreate=V-create
-pokemob.move.venomdrench=Venom Drench
-pokemob.move.venoshock=Venoshock
-pokemob.move.vicegrip=Vice Grip
-pokemob.move.vinewhip=Vine Whip
-pokemob.move.vitalthrow=Vital Throw
-pokemob.move.voltswitch=Volt Switch
-pokemob.move.volttackle=Volt Tackle
-pokemob.move.wakeupslap=Wake-Up Slap
-pokemob.move.waterfall=Waterfall
-pokemob.move.watergun=Water Gun
-pokemob.move.waterpledge=Water Pledge
-pokemob.move.waterpulse=Water Pulse
-pokemob.move.watershuriken=Water Shuriken
-pokemob.move.watersport=Water Sport
-pokemob.move.waterspout=Water Spout
-pokemob.move.weatherball=Weather Ball
-pokemob.move.whirlpool=Whirlpool
-pokemob.move.whirlwind=Whirlwind
-pokemob.move.wideguard=Wide Guard
-pokemob.move.wildcharge=Wild Charge
-pokemob.move.willowisp=Will-O-Wisp
-pokemob.move.wingattack=Wing Attack
-pokemob.move.wish=Wish
-pokemob.move.withdraw=Withdraw
-pokemob.move.wonderroom=Wonder Room
-pokemob.move.woodhammer=Wood Hammer
-pokemob.move.workup=Work Up
-pokemob.move.worryseed=Worry Seed
-pokemob.move.wrap=Wrap
-pokemob.move.wringout=Wring Out
-pokemob.move.xscissor=X-Scissor
-pokemob.move.yawn=Yawn
-pokemob.move.zapcannon=Zap Cannon
-pokemob.move.zenheadbutt=Zen Headbutt
-pokemob.move.zingzap=Zing Zap
-pokemob.move.bouncybubble=Bouncy Bubble
-pokemob.move.buzzybuzz=Buzzy Buzz
-pokemob.move.sizzlyslide=Sizzly Slide
-pokemob.move.glitzyglow=Glitzy Glow
-pokemob.move.baddybad=Baddy Bad
-pokemob.move.sappyseed=Sappy Seed
-pokemob.move.freezyfrost=Freezy Frost
-pokemob.move.sparklyswirl=Sparkly Swirl
-pokemob.move.veeveevolley=Veevee Volley
-pokemob.move.zippyzap=Zippy Zap
-pokemob.move.splishysplash=Splishy Splash
-pokemob.move.floatyfall=Floaty Fall
-pokemob.move.pikapapow=Pika PaPow
diff --git a/src/main/resources/assets/pokecube_moves/lang/en_us.json b/src/main/resources/assets/pokecube_moves/lang/en_us.json
index fc13ae18cc..d8a94ec618 100644
--- a/src/main/resources/assets/pokecube_moves/lang/en_us.json
+++ b/src/main/resources/assets/pokecube_moves/lang/en_us.json
@@ -1,948 +1,846 @@
 {
-    "_comment": "Pokecube translation",
-
-    "_comment": "#Move Messages",
-
-    "pokemob.status.curse.user": "%1$s §cwas hurt by the curse",
-    "pokemob.status.flinch.user": "%1$s §cflinched",
-    "pokemob.status.confuse.add.user": "%1$s §cis confused",
-    "pokemob.status.confuse.remove.user": "%1$s §ais no longer confused",
-    "pokemob.status.confusion.user": "%1$s §churt itself in confusion",
-    "pokemob.status.infatuate.user": "%1$s §cis immobilized by love",
-    "pokemob.move.stat.fail.user": "§cThe status effect failed!",
-
-    "pokemob.status.curse.target": "%1$s §awas hurt by the curse",
-    "pokemob.status.flinch.target": "%1$s §aflinched",
-    "pokemob.status.confuse.add.target": "%1$s §ais confused",
-    "pokemob.status.confuse.remove.target": "%1$s §cis no longer confused",
-    "pokemob.status.confusion.target": "%1$s §ahurt itself in confusion",
-    "pokemob.status.infatuate.target": "%1$s §ais immobilized by love",
-    "pokemob.move.stat.fail.target": "§aThe status effect failed!",
-
-    "pokemob.move.super.effective.user": "§aIt's super effective!",
-    "pokemob.move.not.very.effective.user": "§cIt's not very effective!",
-    "pokemob.move.doesnt.affect.user": "§cIt doesn't affect§r %1$s!",
-    "pokemob.move.critical.hit.user": "§aCritical hit!",
-
-    "pokemob.move.super.effective.target": "§cIt's super effective!",
-    "pokemob.move.not.very.effective.target": "§aIt's not very effective!",
-    "pokemob.move.doesnt.affect.target": "§aIt doesn't affect§r %1$s!",
-    "pokemob.move.critical.hit.target": "§cCritical hit!",
-    
-    "pokemob.move.used.user": "%1$s §aused §c%2$s!",
-    "pokemob.move.used.target": "%1$s §cenemy used §6%2$s!",
-    
-    "pokemob.move.stat.fail.user": "§cBut it failed",
-    "pokemob.move.stat.rise1.user": "%1$s's §6%2$s §arose",
-    "pokemob.move.stat.rise2.user": "%1$s's §6%2$s §asharply rose",
-    "pokemob.move.stat.rise3.user": "%1$s's §6%2$s §adrastically rose",
-    "pokemob.move.stat.fall1.user": "%1$s's §6%2$s §cfell",
-    "pokemob.move.stat.fall2.user": "%1$s's §6%2$s §charshly fell",
-    "pokemob.move.stat.fall3.user": "%1$s's §6%2$s §cdrastically fell",
-    
-    "pokemob.move.stat.fail.target": "§aBut it failed",
-    "pokemob.move.stat.rise1.target": "%1$s's §6%2$s §crose",
-    "pokemob.move.stat.rise2.target": "%1$s's §6%2$s §csharply rose",
-    "pokemob.move.stat.rise3.target": "%1$s's §6%2$s §cdrastically rose",
-    "pokemob.move.stat.fall1.target": "%1$s's §6%2$s §afell",
-    "pokemob.move.stat.fall2.target": "%1$s's §6%2$s §aharshly fell",
-    "pokemob.move.stat.fall3.target": "%1$s's §6%2$s §adrastically fell",
-
-    "pokemob.move.stat1": "Attack",
-    "pokemob.move.stat2": "Defense",
-    "pokemob.move.stat3": "Special Attack",
-    "pokemob.move.stat4": "Special Defense",
-    "pokemob.move.stat5": "Speed",
-    "pokemob.move.stat6": "Accuracy",
-    "pokemob.move.stat7": "Evasion",
-
-    "pokemob.move.notify.learn": "%1$s Learned %2$s",
-    "pokemob.move.terraindamage": "%1$s was hurt by the %2$s",
-
-    "pokemob.move.missed.user": "§cIt missed§r %1$s!",
-    "pokemob.move.missed.target": "§aIt missed§r %1$s!",
-
-    "pokemob.move.failed.user": "%1$s's §cattack failed!",
-    "pokemob.move.failed.target": "%1$s's §aattack failed!",
-
-    "pokemob.move.isfrozen.user": "%1$s §cis frozen.",
-    "pokemob.move.issleeping.user": "%1$s §cis sleeping.",
-    "pokemob.move.isfullyparalyzed.user": "%1$s §cis fully paralyzed.",
-    "pokemob.move.paralyzed.user": "%1$s §cis paralyzed.",
-    "pokemob.move.isburned.user": "%1$s §cis burned.",
-    "pokemob.move.ispoisoned.user": "%1$s §cis poisoned.",
-    "pokemob.move.isbadlypoisoned.user": "%1$s §cis badly poisoned.",
-
-    "pokemob.move.isfrozen.target": "%1$s §ais frozen.",
-    "pokemob.move.issleeping.target": "%1$s §ais sleeping.",
-    "pokemob.move.isfullyparalyzed.target": "%1$s §ais fully paralyzed.",
-    "pokemob.move.paralyzed.target": "%1$s §ais paralyzed.",
-    "pokemob.move.isburned.target": "%1$s §ais burned.",
-    "pokemob.move.ispoisoned.target": "%1$s §ais poisoned.",
-    "pokemob.move.isbadlypoisoned.target": "%1$s §ais badly poisoned.",
-
-    "pokemob.move.sketched": "%1$s Sketched %2$s",
-
-    "pokemob.move.cooldown": "%1$s §ccannot use %2$s §cright now.",
-
-    "_comment": "#Move Names",
-    "pokemob.move.10000000voltthunderbolt": "10,000,000 Volt Thunderbolt",
-    "pokemob.move.absorb": "Absorb",
-    "pokemob.move.accelerock": "Accelerock",
-    "pokemob.move.acid": "Acid",
-    "pokemob.move.acidarmor": "Acid Armor",
-    "pokemob.move.aciddownpour": "Acid Downpour",
-    "pokemob.move.acidspray": "Acid Spray",
-    "pokemob.move.acrobatics": "Acrobatics",
-    "pokemob.move.acupressure": "Acupressure",
-    "pokemob.move.aerialace": "Aerial Ace",
-    "pokemob.move.aeroblast": "Aeroblast",
-    "pokemob.move.afteryou": "After You",
-    "pokemob.move.agility": "Agility",
-    "pokemob.move.aircutter": "Air Cutter",
-    "pokemob.move.airslash": "Air Slash",
-    "pokemob.move.alloutpummeling": "All-Out Pummeling",
-    "pokemob.move.allyswitch": "Ally Switch",
-    "pokemob.move.amnesia": "Amnesia",
-    "pokemob.move.anchorshot": "Anchor Shot",
-    "pokemob.move.ancientpower": "Ancient Power",
-    "pokemob.move.aquajet": "Aqua Jet",
-    "pokemob.move.aquaring": "Aqua Ring",
-    "pokemob.move.aquatail": "Aqua Tail",
-    "pokemob.move.armthrust": "Arm Thrust",
-    "pokemob.move.aromatherapy": "Aromatherapy",
-    "pokemob.move.aromaticmist": "Aromatic Mist",
-    "pokemob.move.assist": "Assist",
-    "pokemob.move.assurance": "Assurance",
-    "pokemob.move.astonish": "Astonish",
-    "pokemob.move.attackorder": "Attack Order",
-    "pokemob.move.attract": "Attract",
-    "pokemob.move.aurasphere": "Aura Sphere",
-    "pokemob.move.aurorabeam": "Aurora Beam",
-    "pokemob.move.auroraveil": "Aurora Veil",
-    "pokemob.move.autotomize": "Autotomize",
-    "pokemob.move.avalanche": "Avalanche",
-    "pokemob.move.babydolleyes": "Baby-Doll Eyes",
-    "pokemob.move.banefulbunker": "Baneful Bunker",
-    "pokemob.move.barrage": "Barrage",
-    "pokemob.move.barrier": "Barrier",
-    "pokemob.move.batonpass": "Baton Pass",
-    "pokemob.move.beakblast": "Beak Blast",
-    "pokemob.move.beatup": "Beat Up",
-    "pokemob.move.belch": "Belch",
-    "pokemob.move.bellydrum": "Belly Drum",
-    "pokemob.move.bestow": "Bestow",
-    "pokemob.move.bide": "Bide",
-    "pokemob.move.bind": "Bind",
-    "pokemob.move.bite": "Bite",
-    "pokemob.move.blackholeeclipse": "Black Hole Eclipse",
-    "pokemob.move.blastburn": "Blast Burn",
-    "pokemob.move.blazekick": "Blaze Kick",
-    "pokemob.move.blizzard": "Blizzard",
-    "pokemob.move.block": "Block",
-    "pokemob.move.bloomdoom": "Bloom Doom",
-    "pokemob.move.blueflare": "Blue Flare",
-    "pokemob.move.bodyslam": "Body Slam",
-    "pokemob.move.boltstrike": "Bolt Strike",
-    "pokemob.move.boneclub": "Bone Club",
-    "pokemob.move.bonemerang": "Bonemerang",
-    "pokemob.move.bonerush": "Bone Rush",
-    "pokemob.move.boomburst": "Boomburst",
-    "pokemob.move.bounce": "Bounce",
-    "pokemob.move.bravebird": "Brave Bird",
-    "pokemob.move.breakneckblitz": "Breakneck Blitz",
-    "pokemob.move.brickbreak": "Brick Break",
-    "pokemob.move.brine": "Brine",
-    "pokemob.move.brutalswing": "Brutal Swing",
-    "pokemob.move.bubble": "Bubble",
-    "pokemob.move.bubblebeam": "Bubble Beam",
-    "pokemob.move.bugbite": "Bug Bite",
-    "pokemob.move.bugbuzz": "Bug Buzz",
-    "pokemob.move.bulkup": "Bulk Up",
-    "pokemob.move.bulldoze": "Bulldoze",
-    "pokemob.move.bulletpunch": "Bullet Punch",
-    "pokemob.move.bulletseed": "Bullet Seed",
-    "pokemob.move.burnup": "Burn Up",
-    "pokemob.move.calmmind": "Calm Mind",
-    "pokemob.move.camouflage": "Camouflage",
-    "pokemob.move.captivate": "Captivate",
-    "pokemob.move.catastropika": "Catastropika",
-    "pokemob.move.celebrate": "Celebrate",
-    "pokemob.move.charge": "Charge",
-    "pokemob.move.chargebeam": "Charge Beam",
-    "pokemob.move.charm": "Charm",
-    "pokemob.move.chatter": "Chatter",
-    "pokemob.move.chipaway": "Chip Away",
-    "pokemob.move.circlethrow": "Circle Throw",
-    "pokemob.move.clamp": "Clamp",
-    "pokemob.move.clangingscales": "Clanging Scales",
-    "pokemob.move.clearsmog": "Clear Smog",
-    "pokemob.move.closecombat": "Close Combat",
-    "pokemob.move.coil": "Coil",
-    "pokemob.move.cometpunch": "Comet Punch",
-    "pokemob.move.confide": "Confide",
-    "pokemob.move.confuseray": "Confuse Ray",
-    "pokemob.move.confusion": "Confusion",
-    "pokemob.move.constrict": "Constrict",
-    "pokemob.move.continentalcrush": "Continental Crush",
-    "pokemob.move.conversion": "Conversion",
-    "pokemob.move.conversion2": "Conversion 2",
-    "pokemob.move.copycat": "Copycat",
-    "pokemob.move.coreenforcer": "Core Enforcer",
-    "pokemob.move.corkscrewcrash": "Corkscrew Crash",
-    "pokemob.move.cosmicpower": "Cosmic Power",
-    "pokemob.move.cottonguard": "Cotton Guard",
-    "pokemob.move.cottonspore": "Cotton Spore",
-    "pokemob.move.counter": "Counter",
-    "pokemob.move.covet": "Covet",
-    "pokemob.move.crabhammer": "Crabhammer",
-    "pokemob.move.craftyshield": "Crafty Shield",
-    "pokemob.move.crosschop": "Cross Chop",
-    "pokemob.move.crosspoison": "Cross Poison",
-    "pokemob.move.crunch": "Crunch",
-    "pokemob.move.crushclaw": "Crush Claw",
-    "pokemob.move.crushgrip": "Crush Grip",
-    "pokemob.move.curse": "Curse",
-    "pokemob.move.cut": "Cut",
-    "pokemob.move.darkestlariat": "Darkest Lariat",
-    "pokemob.move.darkpulse": "Dark Pulse",
-    "pokemob.move.darkvoid": "Dark Void",
-    "pokemob.move.dazzlinggleam": "Dazzling Gleam",
-    "pokemob.move.defendorder": "Defend Order",
-    "pokemob.move.defensecurl": "Defense Curl",
-    "pokemob.move.defog": "Defog",
-    "pokemob.move.destinybond": "Destiny Bond",
-    "pokemob.move.detect": "Detect",
-    "pokemob.move.devastatingdrake": "Devastating Drake",
-    "pokemob.move.diamondstorm": "Diamond Storm",
-    "pokemob.move.dig": "Dig",
-    "pokemob.move.disable": "Disable",
-    "pokemob.move.disarmingvoice": "Disarming Voice",
-    "pokemob.move.discharge": "Discharge",
-    "pokemob.move.dive": "Dive",
-    "pokemob.move.dizzypunch": "Dizzy Punch",
-    "pokemob.move.doomdesire": "Doom Desire",
-    "pokemob.move.doubleedge": "Double-Edge",
-    "pokemob.move.doubleironbash": "Double Iron Bash",
-    "pokemob.move.doublehit": "Double Hit",
-    "pokemob.move.doublekick": "Double Kick",
-    "pokemob.move.doubleslap": "Double Slap",
-    "pokemob.move.doubleteam": "Double Team",
-    "pokemob.move.dracometeor": "Draco Meteor",
-    "pokemob.move.dragonascent": "Dragon Ascent",
-    "pokemob.move.dragonbreath": "Dragon Breath",
-    "pokemob.move.dragonclaw": "Dragon Claw",
-    "pokemob.move.dragondance": "Dragon Dance",
-    "pokemob.move.dragonhammer": "Dragon Hammer",
-    "pokemob.move.dragonpulse": "Dragon Pulse",
-    "pokemob.move.dragonrage": "Dragon Rage",
-    "pokemob.move.dragonrush": "Dragon Rush",
-    "pokemob.move.dragontail": "Dragon Tail",
-    "pokemob.move.drainingkiss": "Draining Kiss",
-    "pokemob.move.drainpunch": "Drain Punch",
-    "pokemob.move.dreameater": "Dream Eater",
-    "pokemob.move.drillpeck": "Drill Peck",
-    "pokemob.move.drillrun": "Drill Run",
-    "pokemob.move.dualchop": "Dual Chop",
-    "pokemob.move.dynamicpunch": "Dynamic Punch",
-    "pokemob.move.earthpower": "Earth Power",
-    "pokemob.move.earthquake": "Earthquake",
-    "pokemob.move.echoedvoice": "Echoed Voice",
-    "pokemob.move.eerieimpulse": "Eerie Impulse",
-    "pokemob.move.eggbomb": "Egg Bomb",
-    "pokemob.move.electricterrain": "Electric Terrain",
-    "pokemob.move.electrify": "Electrify",
-    "pokemob.move.electroball": "Electro Ball",
-    "pokemob.move.electroweb": "Electroweb",
-    "pokemob.move.embargo": "Embargo",
-    "pokemob.move.ember": "Ember",
-    "pokemob.move.encore": "Encore",
-    "pokemob.move.endeavor": "Endeavor",
-    "pokemob.move.endure": "Endure",
-    "pokemob.move.energyball": "Energy Ball",
-    "pokemob.move.entrainment": "Entrainment",
-    "pokemob.move.eruption": "Eruption",
-    "pokemob.move.explosion": "Explosion",
-    "pokemob.move.extrasensory": "Extrasensory",
-    "pokemob.move.extremeevoboost": "Extreme Evoboost",
-    "pokemob.move.extremespeed": "Extreme Speed",
-    "pokemob.move.facade": "Facade",
-    "pokemob.move.fairylock": "Fairy Lock",
-    "pokemob.move.fairywind": "Fairy Wind",
-    "pokemob.move.fakeout": "Fake Out",
-    "pokemob.move.faketears": "Fake Tears",
-    "pokemob.move.falseswipe": "False Swipe",
-    "pokemob.move.featherdance": "Feather Dance",
-    "pokemob.move.feint": "Feint",
-    "pokemob.move.feintattack": "Feint Attack",
-    "pokemob.move.fellstinger": "Fell Stinger",
-    "pokemob.move.fierydance": "Fiery Dance",
-    "pokemob.move.finalgambit": "Final Gambit",
-    "pokemob.move.fireblast": "Fire Blast",
-    "pokemob.move.firefang": "Fire Fang",
-    "pokemob.move.firelash": "Fire Lash",
-    "pokemob.move.firepledge": "Fire Pledge",
-    "pokemob.move.firepunch": "Fire Punch",
-    "pokemob.move.firespin": "Fire Spin",
-    "pokemob.move.firstimpression": "First Impression",
-    "pokemob.move.fissure": "Fissure",
-    "pokemob.move.flail": "Flail",
-    "pokemob.move.flameburst": "Flame Burst",
-    "pokemob.move.flamecharge": "Flame Charge",
-    "pokemob.move.flamethrower": "Flamethrower",
-    "pokemob.move.flamewheel": "Flame Wheel",
-    "pokemob.move.flareblitz": "Flare Blitz",
-    "pokemob.move.flash": "Flash",
-    "pokemob.move.flashcannon": "Flash Cannon",
-    "pokemob.move.flatter": "Flatter",
-    "pokemob.move.fleurcannon": "Fleur Cannon",
-    "pokemob.move.fling": "Fling",
-    "pokemob.move.floralhealing": "Floral Healing",
-    "pokemob.move.flowershield": "Flower Shield",
-    "pokemob.move.fly": "Fly",
-    "pokemob.move.flyingpress": "Flying Press",
-    "pokemob.move.focusblast": "Focus Blast",
-    "pokemob.move.focusenergy": "Focus Energy",
-    "pokemob.move.focuspunch": "Focus Punch",
-    "pokemob.move.followme": "Follow Me",
-    "pokemob.move.forcepalm": "Force Palm",
-    "pokemob.move.foresight": "Foresight",
-    "pokemob.move.forestscurse": "Forest’s Curse",
-    "pokemob.move.foulplay": "Foul Play",
-    "pokemob.move.freezedry": "Freeze-Dry",
-    "pokemob.move.freezeshock": "Freeze Shock",
-    "pokemob.move.frenzyplant": "Frenzy Plant",
-    "pokemob.move.frostbreath": "Frost Breath",
-    "pokemob.move.frustration": "Frustration",
-    "pokemob.move.furyattack": "Fury Attack",
-    "pokemob.move.furycutter": "Fury Cutter",
-    "pokemob.move.furyswipes": "Fury Swipes",
-    "pokemob.move.fusionbolt": "Fusion Bolt",
-    "pokemob.move.fusionflare": "Fusion Flare",
-    "pokemob.move.futuresight": "Future Sight",
-    "pokemob.move.gastroacid": "Gastro Acid",
-    "pokemob.move.geargrind": "Gear Grind",
-    "pokemob.move.gearup": "Gear Up",
-    "pokemob.move.genesissupernova": "Genesis Supernova",
-    "pokemob.move.geomancy": "Geomancy",
-    "pokemob.move.gigadrain": "Giga Drain",
-    "pokemob.move.gigaimpact": "Giga Impact",
-    "pokemob.move.gigavolthavoc": "Gigavolt Havoc",
-    "pokemob.move.glaciate": "Glaciate",
-    "pokemob.move.glare": "Glare",
-    "pokemob.move.grassknot": "Grass Knot",
-    "pokemob.move.grasspledge": "Grass Pledge",
-    "pokemob.move.grasswhistle": "Grass Whistle",
-    "pokemob.move.grassyterrain": "Grassy Terrain",
-    "pokemob.move.gravity": "Gravity",
-    "pokemob.move.growl": "Growl",
-    "pokemob.move.growth": "Growth",
-    "pokemob.move.grudge": "Grudge",
-    "pokemob.move.guardianofalola": "Guardian of Alola",
-    "pokemob.move.guardsplit": "Guard Split",
-    "pokemob.move.guardswap": "Guard Swap",
-    "pokemob.move.guillotine": "Guillotine",
-    "pokemob.move.gunkshot": "Gunk Shot",
-    "pokemob.move.gust": "Gust",
-    "pokemob.move.gyroball": "Gyro Ball",
-    "pokemob.move.hail": "Hail",
-    "pokemob.move.hammerarm": "Hammer Arm",
-    "pokemob.move.happyhour": "Happy Hour",
-    "pokemob.move.harden": "Harden",
-    "pokemob.move.haze": "Haze",
-    "pokemob.move.headbutt": "Headbutt",
-    "pokemob.move.headcharge": "Head Charge",
-    "pokemob.move.headsmash": "Head Smash",
-    "pokemob.move.healbell": "Heal Bell",
-    "pokemob.move.healblock": "Heal Block",
-    "pokemob.move.healingwish": "Healing Wish",
-    "pokemob.move.healorder": "Heal Order",
-    "pokemob.move.healpulse": "Heal Pulse",
-    "pokemob.move.heartstamp": "Heart Stamp",
-    "pokemob.move.heartswap": "Heart Swap",
-    "pokemob.move.heatcrash": "Heat Crash",
-    "pokemob.move.heatwave": "Heat Wave",
-    "pokemob.move.heavyslam": "Heavy Slam",
-    "pokemob.move.helpinghand": "Helping Hand",
-    "pokemob.move.hex": "Hex",
-    "pokemob.move.hiddenpower": "Hidden Power",
-    "pokemob.move.highhorsepower": "High Horsepower",
-    "pokemob.move.highjumpkick": "High Jump Kick",
-    "pokemob.move.holdback": "Hold Back",
-    "pokemob.move.holdhands": "Hold Hands",
-    "pokemob.move.honeclaws": "Hone Claws",
-    "pokemob.move.hornattack": "Horn Attack",
-    "pokemob.move.horndrill": "Horn Drill",
-    "pokemob.move.hornleech": "Horn Leech",
-    "pokemob.move.howl": "Howl",
-    "pokemob.move.hurricane": "Hurricane",
-    "pokemob.move.hydrocannon": "Hydro Cannon",
-    "pokemob.move.hydropump": "Hydro Pump",
-    "pokemob.move.hydrovortex": "Hydro Vortex",
-    "pokemob.move.hyperbeam": "Hyper Beam",
-    "pokemob.move.hyperfang": "Hyper Fang",
-    "pokemob.move.hyperspacefury": "Hyperspace Fury",
-    "pokemob.move.hyperspacehole": "Hyperspace Hole",
-    "pokemob.move.hypervoice": "Hyper Voice",
-    "pokemob.move.hypnosis": "Hypnosis",
-    "pokemob.move.iceball": "Ice Ball",
-    "pokemob.move.icebeam": "Ice Beam",
-    "pokemob.move.iceburn": "Ice Burn",
-    "pokemob.move.icefang": "Ice Fang",
-    "pokemob.move.icehammer": "Ice Hammer",
-    "pokemob.move.icepunch": "Ice Punch",
-    "pokemob.move.iceshard": "Ice Shard",
-    "pokemob.move.iciclecrash": "Icicle Crash",
-    "pokemob.move.iciclespear": "Icicle Spear",
-    "pokemob.move.icywind": "Icy Wind",
-    "pokemob.move.imprison": "Imprison",
-    "pokemob.move.incinerate": "Incinerate",
-    "pokemob.move.inferno": "Inferno",
-    "pokemob.move.infernooverdrive": "Inferno Overdrive",
-    "pokemob.move.infestation": "Infestation",
-    "pokemob.move.ingrain": "Ingrain",
-    "pokemob.move.instruct": "Instruct",
-    "pokemob.move.iondeluge": "Ion Deluge",
-    "pokemob.move.irondefense": "Iron Defense",
-    "pokemob.move.ironhead": "Iron Head",
-    "pokemob.move.irontail": "Iron Tail",
-    "pokemob.move.judgment": "Judgment",
-    "pokemob.move.jumpkick": "Jump Kick",
-    "pokemob.move.karatechop": "Karate Chop",
-    "pokemob.move.kinesis": "Kinesis",
-    "pokemob.move.kingsshield": "King’s Shield",
-    "pokemob.move.knockoff": "Knock Off",
-    "pokemob.move.landswrath": "Land’s Wrath",
-    "pokemob.move.laserfocus": "Laser Focus",
-    "pokemob.move.lastresort": "Last Resort",
-    "pokemob.move.lavaplume": "Lava Plume",
-    "pokemob.move.leafage": "Leafage",
-    "pokemob.move.leafblade": "Leaf Blade",
-    "pokemob.move.leafstorm": "Leaf Storm",
-    "pokemob.move.leaftornado": "Leaf Tornado",
-    "pokemob.move.leechlife": "Leech Life",
-    "pokemob.move.leechseed": "Leech Seed",
-    "pokemob.move.leer": "Leer",
-    "pokemob.move.lick": "Lick",
-    "pokemob.move.lightofruin": "Light of Ruin",
-    "pokemob.move.lightscreen": "Light Screen",
-    "pokemob.move.liquidation": "Liquidation",
-    "pokemob.move.lockon": "Lock-On",
-    "pokemob.move.lovelykiss": "Lovely Kiss",
-    "pokemob.move.lowkick": "Low Kick",
-    "pokemob.move.lowsweep": "Low Sweep",
-    "pokemob.move.luckychant": "Lucky Chant",
-    "pokemob.move.lunardance": "Lunar Dance",
-    "pokemob.move.lunge": "Lunge",
-    "pokemob.move.lusterpurge": "Luster Purge",
-    "pokemob.move.machpunch": "Mach Punch",
-    "pokemob.move.magicalleaf": "Magical Leaf",
-    "pokemob.move.magiccoat": "Magic Coat",
-    "pokemob.move.magicroom": "Magic Room",
-    "pokemob.move.magmastorm": "Magma Storm",
-    "pokemob.move.magnetbomb": "Magnet Bomb",
-    "pokemob.move.magneticflux": "Magnetic Flux",
-    "pokemob.move.magnetrise": "Magnet Rise",
-    "pokemob.move.magnitude": "Magnitude",
-    "pokemob.move.maliciousmoonsault": "Malicious Moonsault",
-    "pokemob.move.matblock": "Mat Block",
-    "pokemob.move.meanlook": "Mean Look",
-    "pokemob.move.meditate": "Meditate",
-    "pokemob.move.mefirst": "Me First",
-    "pokemob.move.megadrain": "Mega Drain",
-    "pokemob.move.megahorn": "Megahorn",
-    "pokemob.move.megakick": "Mega Kick",
-    "pokemob.move.megapunch": "Mega Punch",
-    "pokemob.move.memento": "Memento",
-    "pokemob.move.metalburst": "Metal Burst",
-    "pokemob.move.metalclaw": "Metal Claw",
-    "pokemob.move.metalsound": "Metal Sound",
-    "pokemob.move.meteormash": "Meteor Mash",
-    "pokemob.move.metronome": "Metronome",
-    "pokemob.move.milkdrink": "Milk Drink",
-    "pokemob.move.mimic": "Mimic",
-    "pokemob.move.mindreader": "Mind Reader",
-    "pokemob.move.minimize": "Minimize",
-    "pokemob.move.miracleeye": "Miracle Eye",
-    "pokemob.move.mirrorcoat": "Mirror Coat",
-    "pokemob.move.mirrormove": "Mirror Move",
-    "pokemob.move.mirrorshot": "Mirror Shot",
-    "pokemob.move.mist": "Mist",
-    "pokemob.move.mistball": "Mist Ball",
-    "pokemob.move.mistyterrain": "Misty Terrain",
-    "pokemob.move.moonblast": "Moonblast",
-    "pokemob.move.moongeistbeam": "Moongeist Beam",
-    "pokemob.move.moonlight": "Moonlight",
-    "pokemob.move.morningsun": "Morning Sun",
-    "pokemob.move.mudbomb": "Mud Bomb",
-    "pokemob.move.muddywater": "Muddy Water",
-    "pokemob.move.mudshot": "Mud Shot",
-    "pokemob.move.mudslap": "Mud-Slap",
-    "pokemob.move.mudsport": "Mud Sport",
-    "pokemob.move.multiattack": "Multi-Attack",
-    "pokemob.move.mysticalfire": "Mystical Fire",
-    "pokemob.move.nastyplot": "Nasty Plot",
-    "pokemob.move.naturalgift": "Natural Gift",
-    "pokemob.move.naturepower": "Nature Power",
-    "pokemob.move.naturesmadness": "Nature's Madness",
-    "pokemob.move.needlearm": "Needle Arm",
-    "pokemob.move.neverendingnightmare": "Never-Ending Nightmare",
-    "pokemob.move.nightdaze": "Night Daze",
-    "pokemob.move.nightmare": "Nightmare",
-    "pokemob.move.nightshade": "Night Shade",
-    "pokemob.move.nightslash": "Night Slash",
-    "pokemob.move.nobleroar": "Noble Roar",
-    "pokemob.move.nuzzle": "Nuzzle",
-    "pokemob.move.oblivionwing": "Oblivion Wing",
-    "pokemob.move.oceanicoperetta": "Oceanic Operetta",
-    "pokemob.move.octazooka": "Octazooka",
-    "pokemob.move.odorsleuth": "Odor Sleuth",
-    "pokemob.move.ominouswind": "Ominous Wind",
-    "pokemob.move.originpulse": "Origin Pulse",
-    "pokemob.move.outrage": "Outrage",
-    "pokemob.move.overheat": "Overheat",
-    "pokemob.move.painsplit": "Pain Split",
-    "pokemob.move.paraboliccharge": "Parabolic Charge",
-    "pokemob.move.partingshot": "Parting Shot",
-    "pokemob.move.payback": "Payback",
-    "pokemob.move.payday": "Pay Day",
-    "pokemob.move.peck": "Peck",
-    "pokemob.move.perishsong": "Perish Song",
-    "pokemob.move.petalblizzard": "Petal Blizzard",
-    "pokemob.move.petaldance": "Petal Dance",
-    "pokemob.move.phantomforce": "Phantom Force",
-    "pokemob.move.pinmissile": "Pin Missile",
-    "pokemob.move.playnice": "Play Nice",
-    "pokemob.move.playrough": "Play Rough",
-    "pokemob.move.pluck": "Pluck",
-    "pokemob.move.poisonfang": "Poison Fang",
-    "pokemob.move.poisongas": "Poison Gas",
-    "pokemob.move.poisonjab": "Poison Jab",
-    "pokemob.move.poisonpowder": "Poison Powder",
-    "pokemob.move.poisonsting": "Poison Sting",
-    "pokemob.move.poisontail": "Poison Tail",
-    "pokemob.move.pollenpuff": "Pollen Puff",
-	"pokemob.move.photongeyser": "Photon Geyser",
-    "pokemob.move.pound": "Pound",
-    "pokemob.move.powder": "Powder",
-    "pokemob.move.powdersnow": "Powder Snow",
-    "pokemob.move.powergem": "Power Gem",
-    "pokemob.move.powersplit": "Power Split",
-    "pokemob.move.powerswap": "Power Swap",
-    "pokemob.move.powertrick": "Power Trick",
-    "pokemob.move.powertrip": "Power Trip",
-    "pokemob.move.poweruppunch": "Power-Up Punch",
-    "pokemob.move.powerwhip": "Power Whip",
-    "pokemob.move.precipiceblades": "Precipice Blades",
-    "pokemob.move.present": "Present",
-    "pokemob.move.prismaticlaser": "Prismatic Laser",
-    "pokemob.move.protect": "Protect",
-    "pokemob.move.psybeam": "Psybeam",
-    "pokemob.move.psychic": "Psychic",
-    "pokemob.move.psychicfangs": "Psychic Fangs",
-    "pokemob.move.psychicterrain": "Psychic Terrain",
-    "pokemob.move.psychoboost": "Psycho Boost",
-    "pokemob.move.psychocut": "Psycho Cut",
-    "pokemob.move.psychoshift": "Psycho Shift",
-    "pokemob.move.psychup": "Psych Up",
-    "pokemob.move.psyshock": "Psyshock",
-    "pokemob.move.psystrike": "Psystrike",
-    "pokemob.move.psywave": "Psywave",
-    "pokemob.move.pulverizingpancake": "Pulverizing Pancake",
-    "pokemob.move.punishment": "Punishment",
-    "pokemob.move.purify": "Purify",
-    "pokemob.move.pursuit": "Pursuit",
-    "pokemob.move.quash": "Quash",
-    "pokemob.move.quickattack": "Quick Attack",
-    "pokemob.move.quickguard": "Quick Guard",
-    "pokemob.move.quiverdance": "Quiver Dance",
-    "pokemob.move.rage": "Rage",
-    "pokemob.move.ragepowder": "Rage Powder",
-    "pokemob.move.raindance": "Rain Dance",
-    "pokemob.move.rapidspin": "Rapid Spin",
-    "pokemob.move.razorleaf": "Razor Leaf",
-    "pokemob.move.razorshell": "Razor Shell",
-    "pokemob.move.razorwind": "Razor Wind",
-    "pokemob.move.recover": "Recover",
-    "pokemob.move.recycle": "Recycle",
-    "pokemob.move.reflect": "Reflect",
-    "pokemob.move.reflecttype": "Reflect Type",
-    "pokemob.move.refresh": "Refresh",
-    "pokemob.move.relicsong": "Relic Song",
-    "pokemob.move.rest": "Rest",
-    "pokemob.move.retaliate": "Retaliate",
-    "pokemob.move.return": "Return",
-    "pokemob.move.revelationdance": "Revelation Dance",
-    "pokemob.move.revenge": "Revenge",
-    "pokemob.move.reversal": "Reversal",
-    "pokemob.move.roar": "Roar",
-    "pokemob.move.roaroftime": "Roar of Time",
-    "pokemob.move.rockblast": "Rock Blast",
-    "pokemob.move.rockclimb": "Rock Climb",
-    "pokemob.move.rockpolish": "Rock Polish",
-    "pokemob.move.rockslide": "Rock Slide",
-    "pokemob.move.rocksmash": "Rock Smash",
-    "pokemob.move.rockthrow": "Rock Throw",
-    "pokemob.move.rocktomb": "Rock Tomb",
-    "pokemob.move.rockwrecker": "Rock Wrecker",
-    "pokemob.move.roleplay": "Role Play",
-    "pokemob.move.rollingkick": "Rolling Kick",
-    "pokemob.move.rollout": "Rollout",
-    "pokemob.move.roost": "Roost",
-    "pokemob.move.rototiller": "Rototiller",
-    "pokemob.move.round": "Round",
-    "pokemob.move.sacredfire": "Sacred Fire",
-    "pokemob.move.sacredsword": "Sacred Sword",
-    "pokemob.move.safeguard": "Safeguard",
-    "pokemob.move.sandattack": "Sand Attack",
-    "pokemob.move.sandstorm": "Sandstorm",
-    "pokemob.move.sandtomb": "Sand Tomb",
-    "pokemob.move.savagespinout": "Savage Spin-Out",
-    "pokemob.move.scald": "Scald",
-    "pokemob.move.scaryface": "Scary Face",
-    "pokemob.move.scratch": "Scratch",
-    "pokemob.move.screech": "Screech",
-    "pokemob.move.searingshot": "Searing Shot",
-    "pokemob.move.secretpower": "Secret Power",
-    "pokemob.move.secretsword": "Secret Sword",
-    "pokemob.move.seedbomb": "Seed Bomb",
-    "pokemob.move.seedflare": "Seed Flare",
-    "pokemob.move.seismictoss": "Seismic Toss",
-    "pokemob.move.selfdestruct": "Self-Destruct",
-    "pokemob.move.shadowball": "Shadow Ball",
-    "pokemob.move.shadowbone": "Shadow Bone",
-    "pokemob.move.shadowclaw": "Shadow Claw",
-    "pokemob.move.shadowforce": "Shadow Force",
-    "pokemob.move.shadowpunch": "Shadow Punch",
-    "pokemob.move.shadowsneak": "Shadow Sneak",
-    "pokemob.move.sharpen": "Sharpen",
-    "pokemob.move.shatteredpsyche": "Shattered Psyche",
-    "pokemob.move.sheercold": "Sheer Cold",
-    "pokemob.move.shellsmash": "Shell Smash",
-    "pokemob.move.shelltrap": "Shell Trap",
-    "pokemob.move.shiftgear": "Shift Gear",
-    "pokemob.move.shockwave": "Shock Wave",
-    "pokemob.move.shoreup": "Shore Up",
-    "pokemob.move.signalbeam": "Signal Beam",
-    "pokemob.move.silverwind": "Silver Wind",
-    "pokemob.move.simplebeam": "Simple Beam",
-    "pokemob.move.sing": "Sing",
-    "pokemob.move.sinisterarrowraid": "Sinister Arrow Raid",
-    "pokemob.move.sketch": "Sketch",
-    "pokemob.move.skillswap": "Skill Swap",
-    "pokemob.move.skullbash": "Skull Bash",
-    "pokemob.move.skyattack": "Sky Attack",
-    "pokemob.move.skydrop": "Sky Drop",
-    "pokemob.move.skyuppercut": "Sky Uppercut",
-    "pokemob.move.slackoff": "Slack Off",
-    "pokemob.move.slam": "Slam",
-    "pokemob.move.slash": "Slash",
-    "pokemob.move.sleeppowder": "Sleep Powder",
-    "pokemob.move.sleeptalk": "Sleep Talk",
-    "pokemob.move.sludge": "Sludge",
-    "pokemob.move.sludgebomb": "Sludge Bomb",
-    "pokemob.move.sludgewave": "Sludge Wave",
-    "pokemob.move.smackdown": "Smack Down",
-    "pokemob.move.smartstrike": "Smart Strike",
-    "pokemob.move.smellingsalts": "Smelling Salts",
-    "pokemob.move.smog": "Smog",
-    "pokemob.move.smokescreen": "Smokescreen",
-    "pokemob.move.snarl": "Snarl",
-    "pokemob.move.snatch": "Snatch",
-    "pokemob.move.snore": "Snore",
-    "pokemob.move.soak": "Soak",
-    "pokemob.move.softboiled": "Soft-Boiled",
-    "pokemob.move.solarbeam": "Solar Beam",
-    "pokemob.move.solarblade": "Solar Blade",
-    "pokemob.move.sonicboom": "Sonic Boom",
-    "pokemob.move.soulstealing7starstrike": "Soul-Stealing 7-Star Strike",
-    "pokemob.move.spacialrend": "Spacial Rend",
-    "pokemob.move.spark": "Spark",
-    "pokemob.move.sparklingaria": "Sparkling Aria",
-    "pokemob.move.spectralthief": "Spectral Thief",
-    "pokemob.move.speedswap": "Speed Swap",
-    "pokemob.move.spiderweb": "Spider Web",
-    "pokemob.move.spikecannon": "Spike Cannon",
-    "pokemob.move.spikes": "Spikes",
-    "pokemob.move.spikyshield": "Spiky Shield",
-    "pokemob.move.spiritshackle": "Spirit Shackle",
-    "pokemob.move.spite": "Spite",
-    "pokemob.move.spitup": "Spit Up",
-    "pokemob.move.splash": "Splash",
-    "pokemob.move.spore": "Spore",
-    "pokemob.move.spotlight": "Spotlight",
-    "pokemob.move.stealthrock": "Stealth Rock",
-    "pokemob.move.steameruption": "Steam Eruption",
-    "pokemob.move.steamroller": "Steamroller",
-    "pokemob.move.steelwing": "Steel Wing",
-    "pokemob.move.stickyweb": "Sticky Web",
-    "pokemob.move.stockpile": "Stockpile",
-    "pokemob.move.stokedsparksurfer": "Stoked Sparksurfer",
-    "pokemob.move.stomp": "Stomp",
-    "pokemob.move.stompingtantrum": "Stomping Tantrum",
-    "pokemob.move.stoneedge": "Stone Edge",
-    "pokemob.move.storedpower": "Stored Power",
-    "pokemob.move.stormthrow": "Storm Throw",
-    "pokemob.move.strength": "Strength",
-    "pokemob.move.strengthsap": "Strength Sap",
-    "pokemob.move.stringshot": "String Shot",
-    "pokemob.move.struggle": "Struggle",
-    "pokemob.move.strugglebug": "Struggle Bug",
-    "pokemob.move.stunspore": "Stun Spore",
-    "pokemob.move.submission": "Submission",
-    "pokemob.move.substitute": "Substitute",
-    "pokemob.move.subzeroslammer": "Subzero Slammer",
-    "pokemob.move.suckerpunch": "Sucker Punch",
-    "pokemob.move.sunnyday": "Sunny Day",
-    "pokemob.move.sunsteelstrike": "Sunsteel Strike",
-    "pokemob.move.superfang": "Super Fang",
-    "pokemob.move.superpower": "Superpower",
-    "pokemob.move.supersonic": "Supersonic",
-    "pokemob.move.supersonicskystrike": "Supersonic Skystrike",
-    "pokemob.move.surf": "Surf",
-    "pokemob.move.swagger": "Swagger",
-    "pokemob.move.swallow": "Swallow",
-    "pokemob.move.sweetkiss": "Sweet Kiss",
-    "pokemob.move.sweetscent": "Sweet Scent",
-    "pokemob.move.swift": "Swift",
-    "pokemob.move.switcheroo": "Switcheroo",
-    "pokemob.move.swordsdance": "Swords Dance",
-    "pokemob.move.synchronoise": "Synchronoise",
-    "pokemob.move.synthesis": "Synthesis",
-    "pokemob.move.tackle": "Tackle",
-    "pokemob.move.tailglow": "Tail Glow",
-    "pokemob.move.tailslap": "Tail Slap",
-    "pokemob.move.tailwhip": "Tail Whip",
-    "pokemob.move.tailwind": "Tailwind",
-    "pokemob.move.takedown": "Take Down",
-    "pokemob.move.taunt": "Taunt",
-    "pokemob.move.tearfullook": "Tearful Look",
-    "pokemob.move.technoblast": "Techno Blast",
-    "pokemob.move.tectonicrage": "Tectonic Rage",
-    "pokemob.move.teeterdance": "Teeter Dance",
-    "pokemob.move.telekinesis": "Telekinesis",
-    "pokemob.move.teleport": "Teleport",
-    "pokemob.move.thief": "Thief",
-    "pokemob.move.thousandarrows": "Thousand Arrows",
-    "pokemob.move.thousandwaves": "Thousand Waves",
-    "pokemob.move.thrash": "Thrash",
-    "pokemob.move.throatchop": "Throat Chop",
-    "pokemob.move.thunder": "Thunder",
-    "pokemob.move.thunderbolt": "Thunderbolt",
-    "pokemob.move.thunderfang": "Thunder Fang",
-    "pokemob.move.thunderpunch": "Thunder Punch",
-    "pokemob.move.thundershock": "Thunder Shock",
-    "pokemob.move.thunderwave": "Thunder Wave",
-    "pokemob.move.tickle": "Tickle",
-    "pokemob.move.topsyturvy": "Topsy-Turvy",
-    "pokemob.move.torment": "Torment",
-    "pokemob.move.toxic": "Toxic",
-    "pokemob.move.toxicspikes": "Toxic Spikes",
-    "pokemob.move.toxicthread": "Toxic Thread",
-    "pokemob.move.transform": "Transform",
-    "pokemob.move.triattack": "Tri Attack",
-    "pokemob.move.trick": "Trick",
-    "pokemob.move.trickortreat": "Trick-or-Treat",
-    "pokemob.move.trickroom": "Trick Room",
-    "pokemob.move.triplekick": "Triple Kick",
-    "pokemob.move.tropkick": "Trop Kick",
-    "pokemob.move.trumpcard": "Trump Card",
-    "pokemob.move.twineedle": "Twineedle",
-    "pokemob.move.twinkletackle": "Twinkle Tackle",
-    "pokemob.move.twister": "Twister",
-    "pokemob.move.uproar": "Uproar",
-    "pokemob.move.uturn": "U-turn",
-    "pokemob.move.vacuumwave": "Vacuum Wave",
-    "pokemob.move.vcreate": "V-create",
-    "pokemob.move.venomdrench": "Venom Drench",
-    "pokemob.move.venoshock": "Venoshock",
-    "pokemob.move.vicegrip": "Vice Grip",
-    "pokemob.move.vinewhip": "Vine Whip",
-    "pokemob.move.vitalthrow": "Vital Throw",
-    "pokemob.move.voltswitch": "Volt Switch",
-    "pokemob.move.volttackle": "Volt Tackle",
-    "pokemob.move.wakeupslap": "Wake-Up Slap",
-    "pokemob.move.waterfall": "Waterfall",
-    "pokemob.move.watergun": "Water Gun",
-    "pokemob.move.waterpledge": "Water Pledge",
-    "pokemob.move.waterpulse": "Water Pulse",
-    "pokemob.move.watershuriken": "Water Shuriken",
-    "pokemob.move.watersport": "Water Sport",
-    "pokemob.move.waterspout": "Water Spout",
-    "pokemob.move.weatherball": "Weather Ball",
-    "pokemob.move.whirlpool": "Whirlpool",
-    "pokemob.move.whirlwind": "Whirlwind",
-    "pokemob.move.wideguard": "Wide Guard",
-    "pokemob.move.wildcharge": "Wild Charge",
-    "pokemob.move.willowisp": "Will-O-Wisp",
-    "pokemob.move.wingattack": "Wing Attack",
-    "pokemob.move.wish": "Wish",
-    "pokemob.move.withdraw": "Withdraw",
-    "pokemob.move.wonderroom": "Wonder Room",
-    "pokemob.move.woodhammer": "Wood Hammer",
-    "pokemob.move.workup": "Work Up",
-    "pokemob.move.worryseed": "Worry Seed",
-    "pokemob.move.wrap": "Wrap",
-    "pokemob.move.wringout": "Wring Out",
-    "pokemob.move.xscissor": "X-Scissor",
-    "pokemob.move.yawn": "Yawn",
-    "pokemob.move.zapcannon": "Zap Cannon",
-    "pokemob.move.zenheadbutt": "Zen Headbutt",
-    "pokemob.move.zingzap": "Zing Zap",
-    "pokemob.move.bouncybubble": "Bouncy Bubble",
-    "pokemob.move.buzzybuzz": "Buzzy Buzz",
-    "pokemob.move.sizzlyslide": "Sizzly Slide",
-    "pokemob.move.glitzyglow": "Glitzy Glow",
-    "pokemob.move.baddybad": "Baddy Bad",
-    "pokemob.move.sappyseed": "Sappy Seed",
-    "pokemob.move.freezyfrost": "Freezy Frost",
-    "pokemob.move.sparklyswirl": "Sparkly Swirl",
-    "pokemob.move.veeveevolley": "Veevee Volley",
-    "pokemob.move.zippyzap": "Zippy Zap",
-    "pokemob.move.splishysplash": "Splishy Splash",
-    "pokemob.move.floatyfall": "Floaty Fall",
-    "pokemob.move.pikapapow": "Pika PaPow",
-	"pokemob.move.lightthatburnsthesky": "Light That Burns the Sky",
-	"pokemob.move.dynamaxcannon": "Dynamax Cannon",
-	"pokemob.move.snipeshot": "Snipe Shot",
-	"pokemob.move.jawlock": "Jaw Lock",
-	"pokemob.move.stuffcheeks": "Stuff Cheeks",
-	"pokemob.move.noretreat": "No Retreat",
-	"pokemob.move.tarshot": "Tar Shot",
-	"pokemob.move.magicpowder": "Magic Powder",
-	"pokemob.move.dragondarts": "Dragon Darts",
-	"pokemob.move.teatime": "Teatime",
-	"pokemob.move.octolock": "Octolock",
-	"pokemob.move.boltbeak": "Bolt Beak",
-	"pokemob.move.fishiousrend": "Fishious Rend",
-	"pokemob.move.courtchange": "Court Change",
-	"pokemob.move.clangoroussoul": "Clangorous Soul",
-	"pokemob.move.bodypress": "Body Press",
-	"pokemob.move.decorate": "Decorate",
-	"pokemob.move.drumbeating": "Drum Beating",
-	"pokemob.move.snaptrap": "Snap Trap",
-	"pokemob.move.pyroball": "Pyro Ball",
-	"pokemob.move.behemothblade": "Behemoth Blade",
-	"pokemob.move.behemothbash": "Behemoth Bash",
-	"pokemob.move.aurawheel": "Aura Wheel",
-	"pokemob.move.breakingswipe": "Breaking Swipe",
-	"pokemob.move.branchpoke": "Branch Poke",
-	"pokemob.move.overdrive": "Overdrive",
-	"pokemob.move.appleacid": "Apple Acid",
-	"pokemob.move.gravapple": "Grav Apple",
-	"pokemob.move.spiritbreak": "Spirit Break",
-	"pokemob.move.strangesteam": "Strange Steam",
-	"pokemob.move.lifedew": "Life Dew",
-	"pokemob.move.obstruct": "Obstruct",
-	"pokemob.move.falsesurrender": "False Surrender",
-	"pokemob.move.meteorassault": "Meteor Assault",
-	"pokemob.move.eternabeam": "Eternabeam",
-	"pokemob.move.steelbeam": "Steel Beam",
-	"pokemob.move.expandingforce":"Expanding Force",
-	"pokemob.move.steelroller": "Steel Roller",
-	"pokemob.move.scaleshot": "Scale Shot",
-	"pokemob.move.meteorbeam": "Meteor Beam",
-	"pokemob.move.shellsidearm": "Shell Side Arm",
-	"pokemob.move.mistyexplosion": "Misty Explosion",
-	"pokemob.move.grassyglide": "Grassy Explosion",
-	"pokemob.move.risingvoltage": "Rising Voltage",
-	"pokemob.move.terrainpulse": "Terrain Pulse",
-	"pokemob.move.skittersmack": "Skitter Smack",
-	"pokemob.move.burningjealousy": "Burning Jealousy",
-	"pokemob.move.lashout": "Lashout",
-	"pokemob.move.poltergeist": "Poltergeist",
-	"pokemob.move.corrosivegas": "Corrosive Gas",
-	"pokemob.move.coaching": "Coaching",
-	"pokemob.move.flipturn": "Flip Turn",
-	"pokemob.move.tripleaxel": "triple Axel",
-	"pokemob.move.dualwingbeat": "Dual Wingbeat",
-	"pokemob.move.scorchingsands": "Scorching Sands",
-	"pokemob.move.junglehealing": "Jungle Healing",
-	"pokemob.move.wickedblow": "Wicked Blow",
-	"pokemob.move.surgingstrikes": "Surging Strikes",
-	"pokemob.move.thundercage":"Thunder Cage",
-	"pokemob.move.dragonenergy":"Dragon Energy",
-	"pokemob.move.freezingglare":"Freezing Glare",
-	"pokemob.move.fierywrath":"Fiery Wrath",
-	"pokemob.move.thunderouskick":"Thunderous Kick",
-	"pokemob.move.glaciallance":"Glacial Lance",
-	"pokemob.move.astralbarrage":"Astral Barrage",
-	"pokemob.move.eeriespell":"Eerie Spell",
-	"pokemob.move.steelbeam":"Steel Beam",
-	"pokemob.move.visegrip":"Vise Grip",
-	"pokemob.move.barbbarrage":"Barb Barrage",
-	"pokemob.move.bittermalice":"Bitter Malice",
-	"pokemob.move.bleakwindstorm":"Bleakwind Storm",
-	"pokemob.move.ceaselessedge":"Ceaseless Edge",
-	"pokemob.move.chloroblast":"Chloroblast",
-	"pokemob.move.direclaw":"Dire Claw",
-	"pokemob.move.esperwing":"Esper Wing",
-	"pokemob.move.headlongrush":"Headlong Rush",
-	"pokemob.move.infernalparade":"Infernal Parade",
-	"pokemob.move.lunarblessing":"Lunar Blessing",
-	"pokemob.move.mountaingale":"Mountain Gale",
-	"pokemob.move.mysticalpower":"Mystical Power",
-	"pokemob.move.powershift":"Power Shift",
-	"pokemob.move.psyshieldbash":"Psyshield Bash",
-	"pokemob.move.ragingfury":"Raging Fury",
-	"pokemob.move.sandsearstorm":"Sandsear Storm",
-	"pokemob.move.shelter":"Shelter",
-	"pokemob.move.springtidestorm":"Springtide Storm",
-	"pokemob.move.stoneaxe":"Stone Axe",
-	"pokemob.move.takeheart":"Take Heart",
-	"pokemob.move.triplearrows":"Triple Arrows",
-	"pokemob.move.victorydance":"Victory Dance",
-	"pokemob.move.wavecrash":"Wave Crash",
-	"pokemob.move.wildboltstorm":"Wildbolt Storm",
-	"pokemob.move.maxflare": "Max Flare",
-	"pokemob.move.maxflutterby": "Max Flutterby",
-	"pokemob.move.maxlightning": "Max Lightning",
-	"pokemob.move.maxstrike": "Max Strike",
-	"pokemob.move.maxknuckle": "Max Knuckle",
-	"pokemob.move.maxphantasm": "Max Phantasm",
-	"pokemob.move.maxhailstorm": "Max Hailstorm",
-	"pokemob.move.maxooze": "Max Ooze",
-	"pokemob.move.maxgeyser": "Max Geyser",
-	"pokemob.move.maxairstream": "Max AirStream",
-	"pokemob.move.maxstarfall": "Max Starfall",
-	"pokemob.move.maxwyrmwind": "Max Wyrmwind",
-	"pokemob.move.maxmindstorm": "Max Mindstorm",
-	"pokemob.move.maxrockfall": "Max Rockfall",
-	"pokemob.move.maxquake": "Max Quake",
-	"pokemob.move.maxdarkness": "Max Darkness",
-	"pokemob.move.maxovergrowth": "Max Overgrowth",
-	"pokemob.move.maxsteelspike": "Max Steelspike",
-	"pokemob.move.gmaxwildfire": "G-Max Wildfire",
-	"pokemob.move.gmaxbefuddle": "G-Max Befuddle",
-	"pokemob.move.gmaxvoltcrash": "G-Max Volt Crash",
-	"pokemob.move.gmaxgoldrush": "G-Max Gold Rush",
-	"pokemob.move.gmaxchistrike": "G-Max Chi Strike",
-	"pokemob.move.gmaxterror": "G-Max Terror",
-	"pokemob.move.gmaxresonance": "G-Max Resonance",
-	"pokemob.move.gmaxcuddle": "G-Max Cuddle",
-	"pokemob.move.gmaxreplenish": "G-Max Replenish",
-	"pokemob.move.gmaxmalodor": "G-Max Malodor",
-	"pokemob.move.gmaxstonesurge": "G-Max Stonesurge",
-	"pokemob.move.gmaxwindrage": "G-Max Wind Rage",
-	"pokemob.move.gmaxstunshock": "G-Max Stun Shock",
-	"pokemob.move.gmaxfinale": "G-Max Finale",
-	"pokemob.move.gmaxdepletion": "G-Max Depletion",
-	"pokemob.move.gmaxgravitas": "G-Max Gravitas",
-	"pokemob.move.gmaxvolcalith": "G-Max Volcalith",
-	"pokemob.move.gmaxsandblast": "G-Max Sandblast",
-	"pokemob.move.gmaxsnooze": "G-Max Sooze",
-	"pokemob.move.gmaxtartness": "G-Max Tartness",
-	"pokemob.move.gmaxsweetness": "G-Max Sweetness",
-	"pokemob.move.gmaxsmite": "G-Max Smite",
-	"pokemob.move.gmaxsteelsurge": "G-Max Steelsurge",
-	"pokemob.move.gmaxmeltdown": "G-Max Meltdown",
-	"pokemob.move.gmaxfoamburst": "G-Max Foam Burst",
-	"pokemob.move.gmaxcentiferno": "G-Max Centiferno",
-	"pokemob.move.gmaxfireball": "G-Max Fireball",
-	"pokemob.move.gmaxdrumsolo": "G-Max Drum Solo",
-	"pokemob.move.gmaxhydrosnipe": "G-Max Hydrosnipe",
-	"pokemob.move.gmaxoneblow": "G-Max One Blow",
-	"pokemob.move.gmaxrapidflow": "G-Max Rapid Flow",
-	"pokemob.move.gmaxvinelash": "G-Max Vine Lash",
-	"pokemob.move.gmaxcannonade": "G-Max Cannonade"
+  "pokemob.move.pound": "Pound",
+  "pokemob.move.karate-chop": "Karate Chop",
+  "pokemob.move.double-slap": "Double Slap",
+  "pokemob.move.comet-punch": "Comet Punch",
+  "pokemob.move.mega-punch": "Mega Punch",
+  "pokemob.move.pay-day": "Pay Day",
+  "pokemob.move.fire-punch": "Fire Punch",
+  "pokemob.move.ice-punch": "Ice Punch",
+  "pokemob.move.thunder-punch": "Thunder Punch",
+  "pokemob.move.scratch": "Scratch",
+  "pokemob.move.vice-grip": "Vise Grip",
+  "pokemob.move.guillotine": "Guillotine",
+  "pokemob.move.razor-wind": "Razor Wind",
+  "pokemob.move.swords-dance": "Swords Dance",
+  "pokemob.move.cut": "Cut",
+  "pokemob.move.gust": "Gust",
+  "pokemob.move.wing-attack": "Wing Attack",
+  "pokemob.move.whirlwind": "Whirlwind",
+  "pokemob.move.fly": "Fly",
+  "pokemob.move.bind": "Bind",
+  "pokemob.move.slam": "Slam",
+  "pokemob.move.vine-whip": "Vine Whip",
+  "pokemob.move.stomp": "Stomp",
+  "pokemob.move.double-kick": "Double Kick",
+  "pokemob.move.mega-kick": "Mega Kick",
+  "pokemob.move.jump-kick": "Jump Kick",
+  "pokemob.move.rolling-kick": "Rolling Kick",
+  "pokemob.move.sand-attack": "Sand Attack",
+  "pokemob.move.headbutt": "Headbutt",
+  "pokemob.move.horn-attack": "Horn Attack",
+  "pokemob.move.fury-attack": "Fury Attack",
+  "pokemob.move.horn-drill": "Horn Drill",
+  "pokemob.move.tackle": "Tackle",
+  "pokemob.move.body-slam": "Body Slam",
+  "pokemob.move.wrap": "Wrap",
+  "pokemob.move.take-down": "Take Down",
+  "pokemob.move.thrash": "Thrash",
+  "pokemob.move.double-edge": "Double-Edge",
+  "pokemob.move.tail-whip": "Tail Whip",
+  "pokemob.move.poison-sting": "Poison Sting",
+  "pokemob.move.twineedle": "Twineedle",
+  "pokemob.move.pin-missile": "Pin Missile",
+  "pokemob.move.leer": "Leer",
+  "pokemob.move.bite": "Bite",
+  "pokemob.move.growl": "Growl",
+  "pokemob.move.roar": "Roar",
+  "pokemob.move.sing": "Sing",
+  "pokemob.move.supersonic": "Supersonic",
+  "pokemob.move.sonic-boom": "Sonic Boom",
+  "pokemob.move.disable": "Disable",
+  "pokemob.move.acid": "Acid",
+  "pokemob.move.ember": "Ember",
+  "pokemob.move.flamethrower": "Flamethrower",
+  "pokemob.move.mist": "Mist",
+  "pokemob.move.water-gun": "Water Gun",
+  "pokemob.move.hydro-pump": "Hydro Pump",
+  "pokemob.move.surf": "Surf",
+  "pokemob.move.ice-beam": "Ice Beam",
+  "pokemob.move.blizzard": "Blizzard",
+  "pokemob.move.psybeam": "Psybeam",
+  "pokemob.move.bubble-beam": "Bubble Beam",
+  "pokemob.move.aurora-beam": "Aurora Beam",
+  "pokemob.move.hyper-beam": "Hyper Beam",
+  "pokemob.move.peck": "Peck",
+  "pokemob.move.drill-peck": "Drill Peck",
+  "pokemob.move.submission": "Submission",
+  "pokemob.move.low-kick": "Low Kick",
+  "pokemob.move.counter": "Counter",
+  "pokemob.move.seismic-toss": "Seismic Toss",
+  "pokemob.move.strength": "Strength",
+  "pokemob.move.absorb": "Absorb",
+  "pokemob.move.mega-drain": "Mega Drain",
+  "pokemob.move.leech-seed": "Leech Seed",
+  "pokemob.move.growth": "Growth",
+  "pokemob.move.razor-leaf": "Razor Leaf",
+  "pokemob.move.solar-beam": "Solar Beam",
+  "pokemob.move.poison-powder": "Poison Powder",
+  "pokemob.move.stun-spore": "Stun Spore",
+  "pokemob.move.sleep-powder": "Sleep Powder",
+  "pokemob.move.petal-dance": "Petal Dance",
+  "pokemob.move.string-shot": "String Shot",
+  "pokemob.move.dragon-rage": "Dragon Rage",
+  "pokemob.move.fire-spin": "Fire Spin",
+  "pokemob.move.thunder-shock": "Thunder Shock",
+  "pokemob.move.thunderbolt": "Thunderbolt",
+  "pokemob.move.thunder-wave": "Thunder Wave",
+  "pokemob.move.thunder": "Thunder",
+  "pokemob.move.rock-throw": "Rock Throw",
+  "pokemob.move.earthquake": "Earthquake",
+  "pokemob.move.fissure": "Fissure",
+  "pokemob.move.dig": "Dig",
+  "pokemob.move.toxic": "Toxic",
+  "pokemob.move.confusion": "Confusion",
+  "pokemob.move.psychic": "Psychic",
+  "pokemob.move.hypnosis": "Hypnosis",
+  "pokemob.move.meditate": "Meditate",
+  "pokemob.move.agility": "Agility",
+  "pokemob.move.quick-attack": "Quick Attack",
+  "pokemob.move.rage": "Rage",
+  "pokemob.move.teleport": "Teleport",
+  "pokemob.move.night-shade": "Night Shade",
+  "pokemob.move.mimic": "Mimic",
+  "pokemob.move.screech": "Screech",
+  "pokemob.move.double-team": "Double Team",
+  "pokemob.move.recover": "Recover",
+  "pokemob.move.harden": "Harden",
+  "pokemob.move.minimize": "Minimize",
+  "pokemob.move.smokescreen": "Smokescreen",
+  "pokemob.move.confuse-ray": "Confuse Ray",
+  "pokemob.move.withdraw": "Withdraw",
+  "pokemob.move.defense-curl": "Defense Curl",
+  "pokemob.move.barrier": "Barrier",
+  "pokemob.move.light-screen": "Light Screen",
+  "pokemob.move.haze": "Haze",
+  "pokemob.move.reflect": "Reflect",
+  "pokemob.move.focus-energy": "Focus Energy",
+  "pokemob.move.bide": "Bide",
+  "pokemob.move.metronome": "Metronome",
+  "pokemob.move.mirror-move": "Mirror Move",
+  "pokemob.move.self-destruct": "Self-Destruct",
+  "pokemob.move.egg-bomb": "Egg Bomb",
+  "pokemob.move.lick": "Lick",
+  "pokemob.move.smog": "Smog",
+  "pokemob.move.sludge": "Sludge",
+  "pokemob.move.bone-club": "Bone Club",
+  "pokemob.move.fire-blast": "Fire Blast",
+  "pokemob.move.waterfall": "Waterfall",
+  "pokemob.move.clamp": "Clamp",
+  "pokemob.move.swift": "Swift",
+  "pokemob.move.skull-bash": "Skull Bash",
+  "pokemob.move.spike-cannon": "Spike Cannon",
+  "pokemob.move.constrict": "Constrict",
+  "pokemob.move.amnesia": "Amnesia",
+  "pokemob.move.kinesis": "Kinesis",
+  "pokemob.move.soft-boiled": "Soft-Boiled",
+  "pokemob.move.high-jump-kick": "High Jump Kick",
+  "pokemob.move.glare": "Glare",
+  "pokemob.move.dream-eater": "Dream Eater",
+  "pokemob.move.poison-gas": "Poison Gas",
+  "pokemob.move.barrage": "Barrage",
+  "pokemob.move.leech-life": "Leech Life",
+  "pokemob.move.lovely-kiss": "Lovely Kiss",
+  "pokemob.move.sky-attack": "Sky Attack",
+  "pokemob.move.transform": "Transform",
+  "pokemob.move.bubble": "Bubble",
+  "pokemob.move.dizzy-punch": "Dizzy Punch",
+  "pokemob.move.spore": "Spore",
+  "pokemob.move.flash": "Flash",
+  "pokemob.move.psywave": "Psywave",
+  "pokemob.move.splash": "Splash",
+  "pokemob.move.acid-armor": "Acid Armor",
+  "pokemob.move.crabhammer": "Crabhammer",
+  "pokemob.move.explosion": "Explosion",
+  "pokemob.move.fury-swipes": "Fury Swipes",
+  "pokemob.move.bonemerang": "Bonemerang",
+  "pokemob.move.rest": "Rest",
+  "pokemob.move.rock-slide": "Rock Slide",
+  "pokemob.move.hyper-fang": "Hyper Fang",
+  "pokemob.move.sharpen": "Sharpen",
+  "pokemob.move.conversion": "Conversion",
+  "pokemob.move.tri-attack": "Tri Attack",
+  "pokemob.move.super-fang": "Super Fang",
+  "pokemob.move.slash": "Slash",
+  "pokemob.move.substitute": "Substitute",
+  "pokemob.move.struggle": "Struggle",
+  "pokemob.move.sketch": "Sketch",
+  "pokemob.move.triple-kick": "Triple Kick",
+  "pokemob.move.thief": "Thief",
+  "pokemob.move.spider-web": "Spider Web",
+  "pokemob.move.mind-reader": "Mind Reader",
+  "pokemob.move.nightmare": "Nightmare",
+  "pokemob.move.flame-wheel": "Flame Wheel",
+  "pokemob.move.snore": "Snore",
+  "pokemob.move.curse": "Curse",
+  "pokemob.move.flail": "Flail",
+  "pokemob.move.conversion-2": "Conversion 2",
+  "pokemob.move.aeroblast": "Aeroblast",
+  "pokemob.move.cotton-spore": "Cotton Spore",
+  "pokemob.move.reversal": "Reversal",
+  "pokemob.move.spite": "Spite",
+  "pokemob.move.powder-snow": "Powder Snow",
+  "pokemob.move.protect": "Protect",
+  "pokemob.move.mach-punch": "Mach Punch",
+  "pokemob.move.scary-face": "Scary Face",
+  "pokemob.move.feint-attack": "Feint Attack",
+  "pokemob.move.sweet-kiss": "Sweet Kiss",
+  "pokemob.move.belly-drum": "Belly Drum",
+  "pokemob.move.sludge-bomb": "Sludge Bomb",
+  "pokemob.move.mud-slap": "Mud-Slap",
+  "pokemob.move.octazooka": "Octazooka",
+  "pokemob.move.spikes": "Spikes",
+  "pokemob.move.zap-cannon": "Zap Cannon",
+  "pokemob.move.foresight": "Foresight",
+  "pokemob.move.destiny-bond": "Destiny Bond",
+  "pokemob.move.perish-song": "Perish Song",
+  "pokemob.move.icy-wind": "Icy Wind",
+  "pokemob.move.detect": "Detect",
+  "pokemob.move.bone-rush": "Bone Rush",
+  "pokemob.move.lock-on": "Lock-On",
+  "pokemob.move.outrage": "Outrage",
+  "pokemob.move.sandstorm": "Sandstorm",
+  "pokemob.move.giga-drain": "Giga Drain",
+  "pokemob.move.endure": "Endure",
+  "pokemob.move.charm": "Charm",
+  "pokemob.move.rollout": "Rollout",
+  "pokemob.move.false-swipe": "False Swipe",
+  "pokemob.move.swagger": "Swagger",
+  "pokemob.move.milk-drink": "Milk Drink",
+  "pokemob.move.spark": "Spark",
+  "pokemob.move.fury-cutter": "Fury Cutter",
+  "pokemob.move.steel-wing": "Steel Wing",
+  "pokemob.move.mean-look": "Mean Look",
+  "pokemob.move.attract": "Attract",
+  "pokemob.move.sleep-talk": "Sleep Talk",
+  "pokemob.move.heal-bell": "Heal Bell",
+  "pokemob.move.return": "Return",
+  "pokemob.move.present": "Present",
+  "pokemob.move.frustration": "Frustration",
+  "pokemob.move.safeguard": "Safeguard",
+  "pokemob.move.pain-split": "Pain Split",
+  "pokemob.move.sacred-fire": "Sacred Fire",
+  "pokemob.move.magnitude": "Magnitude",
+  "pokemob.move.dynamic-punch": "Dynamic Punch",
+  "pokemob.move.megahorn": "Megahorn",
+  "pokemob.move.dragon-breath": "Dragon Breath",
+  "pokemob.move.baton-pass": "Baton Pass",
+  "pokemob.move.encore": "Encore",
+  "pokemob.move.pursuit": "Pursuit",
+  "pokemob.move.rapid-spin": "Rapid Spin",
+  "pokemob.move.sweet-scent": "Sweet Scent",
+  "pokemob.move.iron-tail": "Iron Tail",
+  "pokemob.move.metal-claw": "Metal Claw",
+  "pokemob.move.vital-throw": "Vital Throw",
+  "pokemob.move.morning-sun": "Morning Sun",
+  "pokemob.move.synthesis": "Synthesis",
+  "pokemob.move.moonlight": "Moonlight",
+  "pokemob.move.hidden-power": "Hidden Power",
+  "pokemob.move.cross-chop": "Cross Chop",
+  "pokemob.move.twister": "Twister",
+  "pokemob.move.rain-dance": "Rain Dance",
+  "pokemob.move.sunny-day": "Sunny Day",
+  "pokemob.move.crunch": "Crunch",
+  "pokemob.move.mirror-coat": "Mirror Coat",
+  "pokemob.move.psych-up": "Psych Up",
+  "pokemob.move.extreme-speed": "Extreme Speed",
+  "pokemob.move.ancient-power": "Ancient Power",
+  "pokemob.move.shadow-ball": "Shadow Ball",
+  "pokemob.move.future-sight": "Future Sight",
+  "pokemob.move.rock-smash": "Rock Smash",
+  "pokemob.move.whirlpool": "Whirlpool",
+  "pokemob.move.beat-up": "Beat Up",
+  "pokemob.move.fake-out": "Fake Out",
+  "pokemob.move.uproar": "Uproar",
+  "pokemob.move.stockpile": "Stockpile",
+  "pokemob.move.spit-up": "Spit Up",
+  "pokemob.move.swallow": "Swallow",
+  "pokemob.move.heat-wave": "Heat Wave",
+  "pokemob.move.hail": "Hail",
+  "pokemob.move.torment": "Torment",
+  "pokemob.move.flatter": "Flatter",
+  "pokemob.move.will-o-wisp": "Will-O-Wisp",
+  "pokemob.move.memento": "Memento",
+  "pokemob.move.facade": "Facade",
+  "pokemob.move.focus-punch": "Focus Punch",
+  "pokemob.move.smelling-salts": "Smelling Salts",
+  "pokemob.move.follow-me": "Follow Me",
+  "pokemob.move.nature-power": "Nature Power",
+  "pokemob.move.charge": "Charge",
+  "pokemob.move.taunt": "Taunt",
+  "pokemob.move.helping-hand": "Helping Hand",
+  "pokemob.move.trick": "Trick",
+  "pokemob.move.role-play": "Role Play",
+  "pokemob.move.wish": "Wish",
+  "pokemob.move.assist": "Assist",
+  "pokemob.move.ingrain": "Ingrain",
+  "pokemob.move.superpower": "Superpower",
+  "pokemob.move.magic-coat": "Magic Coat",
+  "pokemob.move.recycle": "Recycle",
+  "pokemob.move.revenge": "Revenge",
+  "pokemob.move.brick-break": "Brick Break",
+  "pokemob.move.yawn": "Yawn",
+  "pokemob.move.knock-off": "Knock Off",
+  "pokemob.move.endeavor": "Endeavor",
+  "pokemob.move.eruption": "Eruption",
+  "pokemob.move.skill-swap": "Skill Swap",
+  "pokemob.move.imprison": "Imprison",
+  "pokemob.move.refresh": "Refresh",
+  "pokemob.move.grudge": "Grudge",
+  "pokemob.move.snatch": "Snatch",
+  "pokemob.move.secret-power": "Secret Power",
+  "pokemob.move.dive": "Dive",
+  "pokemob.move.arm-thrust": "Arm Thrust",
+  "pokemob.move.camouflage": "Camouflage",
+  "pokemob.move.tail-glow": "Tail Glow",
+  "pokemob.move.luster-purge": "Luster Purge",
+  "pokemob.move.mist-ball": "Mist Ball",
+  "pokemob.move.feather-dance": "Feather Dance",
+  "pokemob.move.teeter-dance": "Teeter Dance",
+  "pokemob.move.blaze-kick": "Blaze Kick",
+  "pokemob.move.mud-sport": "Mud Sport",
+  "pokemob.move.ice-ball": "Ice Ball",
+  "pokemob.move.needle-arm": "Needle Arm",
+  "pokemob.move.slack-off": "Slack Off",
+  "pokemob.move.hyper-voice": "Hyper Voice",
+  "pokemob.move.poison-fang": "Poison Fang",
+  "pokemob.move.crush-claw": "Crush Claw",
+  "pokemob.move.blast-burn": "Blast Burn",
+  "pokemob.move.hydro-cannon": "Hydro Cannon",
+  "pokemob.move.meteor-mash": "Meteor Mash",
+  "pokemob.move.astonish": "Astonish",
+  "pokemob.move.weather-ball": "Weather Ball",
+  "pokemob.move.aromatherapy": "Aromatherapy",
+  "pokemob.move.fake-tears": "Fake Tears",
+  "pokemob.move.air-cutter": "Air Cutter",
+  "pokemob.move.overheat": "Overheat",
+  "pokemob.move.odor-sleuth": "Odor Sleuth",
+  "pokemob.move.rock-tomb": "Rock Tomb",
+  "pokemob.move.silver-wind": "Silver Wind",
+  "pokemob.move.metal-sound": "Metal Sound",
+  "pokemob.move.grass-whistle": "Grass Whistle",
+  "pokemob.move.tickle": "Tickle",
+  "pokemob.move.cosmic-power": "Cosmic Power",
+  "pokemob.move.water-spout": "Water Spout",
+  "pokemob.move.signal-beam": "Signal Beam",
+  "pokemob.move.shadow-punch": "Shadow Punch",
+  "pokemob.move.extrasensory": "Extrasensory",
+  "pokemob.move.sky-uppercut": "Sky Uppercut",
+  "pokemob.move.sand-tomb": "Sand Tomb",
+  "pokemob.move.sheer-cold": "Sheer Cold",
+  "pokemob.move.muddy-water": "Muddy Water",
+  "pokemob.move.bullet-seed": "Bullet Seed",
+  "pokemob.move.aerial-ace": "Aerial Ace",
+  "pokemob.move.icicle-spear": "Icicle Spear",
+  "pokemob.move.iron-defense": "Iron Defense",
+  "pokemob.move.block": "Block",
+  "pokemob.move.howl": "Howl",
+  "pokemob.move.dragon-claw": "Dragon Claw",
+  "pokemob.move.frenzy-plant": "Frenzy Plant",
+  "pokemob.move.bulk-up": "Bulk Up",
+  "pokemob.move.bounce": "Bounce",
+  "pokemob.move.mud-shot": "Mud Shot",
+  "pokemob.move.poison-tail": "Poison Tail",
+  "pokemob.move.covet": "Covet",
+  "pokemob.move.volt-tackle": "Volt Tackle",
+  "pokemob.move.magical-leaf": "Magical Leaf",
+  "pokemob.move.water-sport": "Water Sport",
+  "pokemob.move.calm-mind": "Calm Mind",
+  "pokemob.move.leaf-blade": "Leaf Blade",
+  "pokemob.move.dragon-dance": "Dragon Dance",
+  "pokemob.move.rock-blast": "Rock Blast",
+  "pokemob.move.shock-wave": "Shock Wave",
+  "pokemob.move.water-pulse": "Water Pulse",
+  "pokemob.move.doom-desire": "Doom Desire",
+  "pokemob.move.psycho-boost": "Psycho Boost",
+  "pokemob.move.roost": "Roost",
+  "pokemob.move.gravity": "Gravity",
+  "pokemob.move.miracle-eye": "Miracle Eye",
+  "pokemob.move.wake-up-slap": "Wake-Up Slap",
+  "pokemob.move.hammer-arm": "Hammer Arm",
+  "pokemob.move.gyro-ball": "Gyro Ball",
+  "pokemob.move.healing-wish": "Healing Wish",
+  "pokemob.move.brine": "Brine",
+  "pokemob.move.natural-gift": "Natural Gift",
+  "pokemob.move.feint": "Feint",
+  "pokemob.move.pluck": "Pluck",
+  "pokemob.move.tailwind": "Tailwind",
+  "pokemob.move.acupressure": "Acupressure",
+  "pokemob.move.metal-burst": "Metal Burst",
+  "pokemob.move.u-turn": "U-turn",
+  "pokemob.move.close-combat": "Close Combat",
+  "pokemob.move.payback": "Payback",
+  "pokemob.move.assurance": "Assurance",
+  "pokemob.move.embargo": "Embargo",
+  "pokemob.move.fling": "Fling",
+  "pokemob.move.psycho-shift": "Psycho Shift",
+  "pokemob.move.trump-card": "Trump Card",
+  "pokemob.move.heal-block": "Heal Block",
+  "pokemob.move.wring-out": "Wring Out",
+  "pokemob.move.power-trick": "Power Trick",
+  "pokemob.move.gastro-acid": "Gastro Acid",
+  "pokemob.move.lucky-chant": "Lucky Chant",
+  "pokemob.move.me-first": "Me First",
+  "pokemob.move.copycat": "Copycat",
+  "pokemob.move.power-swap": "Power Swap",
+  "pokemob.move.guard-swap": "Guard Swap",
+  "pokemob.move.punishment": "Punishment",
+  "pokemob.move.last-resort": "Last Resort",
+  "pokemob.move.worry-seed": "Worry Seed",
+  "pokemob.move.sucker-punch": "Sucker Punch",
+  "pokemob.move.toxic-spikes": "Toxic Spikes",
+  "pokemob.move.heart-swap": "Heart Swap",
+  "pokemob.move.aqua-ring": "Aqua Ring",
+  "pokemob.move.magnet-rise": "Magnet Rise",
+  "pokemob.move.flare-blitz": "Flare Blitz",
+  "pokemob.move.force-palm": "Force Palm",
+  "pokemob.move.aura-sphere": "Aura Sphere",
+  "pokemob.move.rock-polish": "Rock Polish",
+  "pokemob.move.poison-jab": "Poison Jab",
+  "pokemob.move.dark-pulse": "Dark Pulse",
+  "pokemob.move.night-slash": "Night Slash",
+  "pokemob.move.aqua-tail": "Aqua Tail",
+  "pokemob.move.seed-bomb": "Seed Bomb",
+  "pokemob.move.air-slash": "Air Slash",
+  "pokemob.move.x-scissor": "X-Scissor",
+  "pokemob.move.bug-buzz": "Bug Buzz",
+  "pokemob.move.dragon-pulse": "Dragon Pulse",
+  "pokemob.move.dragon-rush": "Dragon Rush",
+  "pokemob.move.power-gem": "Power Gem",
+  "pokemob.move.drain-punch": "Drain Punch",
+  "pokemob.move.vacuum-wave": "Vacuum Wave",
+  "pokemob.move.focus-blast": "Focus Blast",
+  "pokemob.move.energy-ball": "Energy Ball",
+  "pokemob.move.brave-bird": "Brave Bird",
+  "pokemob.move.earth-power": "Earth Power",
+  "pokemob.move.switcheroo": "Switcheroo",
+  "pokemob.move.giga-impact": "Giga Impact",
+  "pokemob.move.nasty-plot": "Nasty Plot",
+  "pokemob.move.bullet-punch": "Bullet Punch",
+  "pokemob.move.avalanche": "Avalanche",
+  "pokemob.move.ice-shard": "Ice Shard",
+  "pokemob.move.shadow-claw": "Shadow Claw",
+  "pokemob.move.thunder-fang": "Thunder Fang",
+  "pokemob.move.ice-fang": "Ice Fang",
+  "pokemob.move.fire-fang": "Fire Fang",
+  "pokemob.move.shadow-sneak": "Shadow Sneak",
+  "pokemob.move.mud-bomb": "Mud Bomb",
+  "pokemob.move.psycho-cut": "Psycho Cut",
+  "pokemob.move.zen-headbutt": "Zen Headbutt",
+  "pokemob.move.mirror-shot": "Mirror Shot",
+  "pokemob.move.flash-cannon": "Flash Cannon",
+  "pokemob.move.rock-climb": "Rock Climb",
+  "pokemob.move.defog": "Defog",
+  "pokemob.move.trick-room": "Trick Room",
+  "pokemob.move.draco-meteor": "Draco Meteor",
+  "pokemob.move.discharge": "Discharge",
+  "pokemob.move.lava-plume": "Lava Plume",
+  "pokemob.move.leaf-storm": "Leaf Storm",
+  "pokemob.move.power-whip": "Power Whip",
+  "pokemob.move.rock-wrecker": "Rock Wrecker",
+  "pokemob.move.cross-poison": "Cross Poison",
+  "pokemob.move.gunk-shot": "Gunk Shot",
+  "pokemob.move.iron-head": "Iron Head",
+  "pokemob.move.magnet-bomb": "Magnet Bomb",
+  "pokemob.move.stone-edge": "Stone Edge",
+  "pokemob.move.captivate": "Captivate",
+  "pokemob.move.stealth-rock": "Stealth Rock",
+  "pokemob.move.grass-knot": "Grass Knot",
+  "pokemob.move.chatter": "Chatter",
+  "pokemob.move.judgment": "Judgment",
+  "pokemob.move.bug-bite": "Bug Bite",
+  "pokemob.move.charge-beam": "Charge Beam",
+  "pokemob.move.wood-hammer": "Wood Hammer",
+  "pokemob.move.aqua-jet": "Aqua Jet",
+  "pokemob.move.attack-order": "Attack Order",
+  "pokemob.move.defend-order": "Defend Order",
+  "pokemob.move.heal-order": "Heal Order",
+  "pokemob.move.head-smash": "Head Smash",
+  "pokemob.move.double-hit": "Double Hit",
+  "pokemob.move.roar-of-time": "Roar of Time",
+  "pokemob.move.spacial-rend": "Spacial Rend",
+  "pokemob.move.lunar-dance": "Lunar Dance",
+  "pokemob.move.crush-grip": "Crush Grip",
+  "pokemob.move.magma-storm": "Magma Storm",
+  "pokemob.move.dark-void": "Dark Void",
+  "pokemob.move.seed-flare": "Seed Flare",
+  "pokemob.move.ominous-wind": "Ominous Wind",
+  "pokemob.move.shadow-force": "Shadow Force",
+  "pokemob.move.hone-claws": "Hone Claws",
+  "pokemob.move.wide-guard": "Wide Guard",
+  "pokemob.move.guard-split": "Guard Split",
+  "pokemob.move.power-split": "Power Split",
+  "pokemob.move.wonder-room": "Wonder Room",
+  "pokemob.move.psyshock": "Psyshock",
+  "pokemob.move.venoshock": "Venoshock",
+  "pokemob.move.autotomize": "Autotomize",
+  "pokemob.move.rage-powder": "Rage Powder",
+  "pokemob.move.telekinesis": "Telekinesis",
+  "pokemob.move.magic-room": "Magic Room",
+  "pokemob.move.smack-down": "Smack Down",
+  "pokemob.move.storm-throw": "Storm Throw",
+  "pokemob.move.flame-burst": "Flame Burst",
+  "pokemob.move.sludge-wave": "Sludge Wave",
+  "pokemob.move.quiver-dance": "Quiver Dance",
+  "pokemob.move.heavy-slam": "Heavy Slam",
+  "pokemob.move.synchronoise": "Synchronoise",
+  "pokemob.move.electro-ball": "Electro Ball",
+  "pokemob.move.soak": "Soak",
+  "pokemob.move.flame-charge": "Flame Charge",
+  "pokemob.move.coil": "Coil",
+  "pokemob.move.low-sweep": "Low Sweep",
+  "pokemob.move.acid-spray": "Acid Spray",
+  "pokemob.move.foul-play": "Foul Play",
+  "pokemob.move.simple-beam": "Simple Beam",
+  "pokemob.move.entrainment": "Entrainment",
+  "pokemob.move.after-you": "After You",
+  "pokemob.move.round": "Round",
+  "pokemob.move.echoed-voice": "Echoed Voice",
+  "pokemob.move.chip-away": "Chip Away",
+  "pokemob.move.clear-smog": "Clear Smog",
+  "pokemob.move.stored-power": "Stored Power",
+  "pokemob.move.quick-guard": "Quick Guard",
+  "pokemob.move.ally-switch": "Ally Switch",
+  "pokemob.move.scald": "Scald",
+  "pokemob.move.shell-smash": "Shell Smash",
+  "pokemob.move.heal-pulse": "Heal Pulse",
+  "pokemob.move.hex": "Hex",
+  "pokemob.move.sky-drop": "Sky Drop",
+  "pokemob.move.shift-gear": "Shift Gear",
+  "pokemob.move.circle-throw": "Circle Throw",
+  "pokemob.move.incinerate": "Incinerate",
+  "pokemob.move.quash": "Quash",
+  "pokemob.move.acrobatics": "Acrobatics",
+  "pokemob.move.reflect-type": "Reflect Type",
+  "pokemob.move.retaliate": "Retaliate",
+  "pokemob.move.final-gambit": "Final Gambit",
+  "pokemob.move.bestow": "Bestow",
+  "pokemob.move.inferno": "Inferno",
+  "pokemob.move.water-pledge": "Water Pledge",
+  "pokemob.move.fire-pledge": "Fire Pledge",
+  "pokemob.move.grass-pledge": "Grass Pledge",
+  "pokemob.move.volt-switch": "Volt Switch",
+  "pokemob.move.struggle-bug": "Struggle Bug",
+  "pokemob.move.bulldoze": "Bulldoze",
+  "pokemob.move.frost-breath": "Frost Breath",
+  "pokemob.move.dragon-tail": "Dragon Tail",
+  "pokemob.move.work-up": "Work Up",
+  "pokemob.move.electroweb": "Electroweb",
+  "pokemob.move.wild-charge": "Wild Charge",
+  "pokemob.move.drill-run": "Drill Run",
+  "pokemob.move.dual-chop": "Dual Chop",
+  "pokemob.move.heart-stamp": "Heart Stamp",
+  "pokemob.move.horn-leech": "Horn Leech",
+  "pokemob.move.sacred-sword": "Sacred Sword",
+  "pokemob.move.razor-shell": "Razor Shell",
+  "pokemob.move.heat-crash": "Heat Crash",
+  "pokemob.move.leaf-tornado": "Leaf Tornado",
+  "pokemob.move.steamroller": "Steamroller",
+  "pokemob.move.cotton-guard": "Cotton Guard",
+  "pokemob.move.night-daze": "Night Daze",
+  "pokemob.move.psystrike": "Psystrike",
+  "pokemob.move.tail-slap": "Tail Slap",
+  "pokemob.move.hurricane": "Hurricane",
+  "pokemob.move.head-charge": "Head Charge",
+  "pokemob.move.gear-grind": "Gear Grind",
+  "pokemob.move.searing-shot": "Searing Shot",
+  "pokemob.move.techno-blast": "Techno Blast",
+  "pokemob.move.relic-song": "Relic Song",
+  "pokemob.move.secret-sword": "Secret Sword",
+  "pokemob.move.glaciate": "Glaciate",
+  "pokemob.move.bolt-strike": "Bolt Strike",
+  "pokemob.move.blue-flare": "Blue Flare",
+  "pokemob.move.fiery-dance": "Fiery Dance",
+  "pokemob.move.freeze-shock": "Freeze Shock",
+  "pokemob.move.ice-burn": "Ice Burn",
+  "pokemob.move.snarl": "Snarl",
+  "pokemob.move.icicle-crash": "Icicle Crash",
+  "pokemob.move.v-create": "V-create",
+  "pokemob.move.fusion-flare": "Fusion Flare",
+  "pokemob.move.fusion-bolt": "Fusion Bolt",
+  "pokemob.move.flying-press": "Flying Press",
+  "pokemob.move.mat-block": "Mat Block",
+  "pokemob.move.belch": "Belch",
+  "pokemob.move.rototiller": "Rototiller",
+  "pokemob.move.sticky-web": "Sticky Web",
+  "pokemob.move.fell-stinger": "Fell Stinger",
+  "pokemob.move.phantom-force": "Phantom Force",
+  "pokemob.move.trick-or-treat": "Trick-or-Treat",
+  "pokemob.move.noble-roar": "Noble Roar",
+  "pokemob.move.ion-deluge": "Ion Deluge",
+  "pokemob.move.parabolic-charge": "Parabolic Charge",
+  "pokemob.move.forests-curse": "Forest’s Curse",
+  "pokemob.move.petal-blizzard": "Petal Blizzard",
+  "pokemob.move.freeze-dry": "Freeze-Dry",
+  "pokemob.move.disarming-voice": "Disarming Voice",
+  "pokemob.move.parting-shot": "Parting Shot",
+  "pokemob.move.topsy-turvy": "Topsy-Turvy",
+  "pokemob.move.draining-kiss": "Draining Kiss",
+  "pokemob.move.crafty-shield": "Crafty Shield",
+  "pokemob.move.flower-shield": "Flower Shield",
+  "pokemob.move.grassy-terrain": "Grassy Terrain",
+  "pokemob.move.misty-terrain": "Misty Terrain",
+  "pokemob.move.electrify": "Electrify",
+  "pokemob.move.play-rough": "Play Rough",
+  "pokemob.move.fairy-wind": "Fairy Wind",
+  "pokemob.move.moonblast": "Moonblast",
+  "pokemob.move.boomburst": "Boomburst",
+  "pokemob.move.fairy-lock": "Fairy Lock",
+  "pokemob.move.kings-shield": "King’s Shield",
+  "pokemob.move.play-nice": "Play Nice",
+  "pokemob.move.confide": "Confide",
+  "pokemob.move.diamond-storm": "Diamond Storm",
+  "pokemob.move.steam-eruption": "Steam Eruption",
+  "pokemob.move.hyperspace-hole": "Hyperspace Hole",
+  "pokemob.move.water-shuriken": "Water Shuriken",
+  "pokemob.move.mystical-fire": "Mystical Fire",
+  "pokemob.move.spiky-shield": "Spiky Shield",
+  "pokemob.move.aromatic-mist": "Aromatic Mist",
+  "pokemob.move.eerie-impulse": "Eerie Impulse",
+  "pokemob.move.venom-drench": "Venom Drench",
+  "pokemob.move.powder": "Powder",
+  "pokemob.move.geomancy": "Geomancy",
+  "pokemob.move.magnetic-flux": "Magnetic Flux",
+  "pokemob.move.happy-hour": "Happy Hour",
+  "pokemob.move.electric-terrain": "Electric Terrain",
+  "pokemob.move.dazzling-gleam": "Dazzling Gleam",
+  "pokemob.move.celebrate": "Celebrate",
+  "pokemob.move.hold-hands": "Hold Hands",
+  "pokemob.move.baby-doll-eyes": "Baby-Doll Eyes",
+  "pokemob.move.nuzzle": "Nuzzle",
+  "pokemob.move.hold-back": "Hold Back",
+  "pokemob.move.infestation": "Infestation",
+  "pokemob.move.power-up-punch": "Power-Up Punch",
+  "pokemob.move.oblivion-wing": "Oblivion Wing",
+  "pokemob.move.thousand-arrows": "Thousand Arrows",
+  "pokemob.move.thousand-waves": "Thousand Waves",
+  "pokemob.move.lands-wrath": "Land’s Wrath",
+  "pokemob.move.light-of-ruin": "Light of Ruin",
+  "pokemob.move.origin-pulse": "Origin Pulse",
+  "pokemob.move.precipice-blades": "Precipice Blades",
+  "pokemob.move.dragon-ascent": "Dragon Ascent",
+  "pokemob.move.hyperspace-fury": "Hyperspace Fury",
+  "pokemob.move.breakneck-blitz--physical": "Breakneck Blitz",
+  "pokemob.move.breakneck-blitz--special": "Breakneck Blitz",
+  "pokemob.move.all-out-pummeling--physical": "All-Out Pummeling",
+  "pokemob.move.all-out-pummeling--special": "All-Out Pummeling",
+  "pokemob.move.supersonic-skystrike--physical": "Supersonic Skystrike",
+  "pokemob.move.supersonic-skystrike--special": "Supersonic Skystrike",
+  "pokemob.move.acid-downpour--physical": "Acid Downpour",
+  "pokemob.move.acid-downpour--special": "Acid Downpour",
+  "pokemob.move.tectonic-rage--physical": "Tectonic Rage",
+  "pokemob.move.tectonic-rage--special": "Tectonic Rage",
+  "pokemob.move.continental-crush--physical": "Continental Crush",
+  "pokemob.move.continental-crush--special": "Continental Crush",
+  "pokemob.move.savage-spin-out--physical": "Savage Spin-Out",
+  "pokemob.move.savage-spin-out--special": "Savage Spin-Out",
+  "pokemob.move.never-ending-nightmare--physical": "Never-Ending Nightmare",
+  "pokemob.move.never-ending-nightmare--special": "Never-Ending Nightmare",
+  "pokemob.move.corkscrew-crash--physical": "Corkscrew Crash",
+  "pokemob.move.corkscrew-crash--special": "Corkscrew Crash",
+  "pokemob.move.inferno-overdrive--physical": "Inferno Overdrive",
+  "pokemob.move.inferno-overdrive--special": "Inferno Overdrive",
+  "pokemob.move.hydro-vortex--physical": "Hydro Vortex",
+  "pokemob.move.hydro-vortex--special": "Hydro Vortex",
+  "pokemob.move.bloom-doom--physical": "Bloom Doom",
+  "pokemob.move.bloom-doom--special": "Bloom Doom",
+  "pokemob.move.gigavolt-havoc--physical": "Gigavolt Havoc",
+  "pokemob.move.gigavolt-havoc--special": "Gigavolt Havoc",
+  "pokemob.move.shattered-psyche--physical": "Shattered Psyche",
+  "pokemob.move.shattered-psyche--special": "Shattered Psyche",
+  "pokemob.move.subzero-slammer--physical": "Subzero Slammer",
+  "pokemob.move.subzero-slammer--special": "Subzero Slammer",
+  "pokemob.move.devastating-drake--physical": "Devastating Drake",
+  "pokemob.move.devastating-drake--special": "Devastating Drake",
+  "pokemob.move.black-hole-eclipse--physical": "Black Hole Eclipse",
+  "pokemob.move.black-hole-eclipse--special": "Black Hole Eclipse",
+  "pokemob.move.twinkle-tackle--physical": "Twinkle Tackle",
+  "pokemob.move.twinkle-tackle--special": "Twinkle Tackle",
+  "pokemob.move.catastropika": "Catastropika",
+  "pokemob.move.shore-up": "Shore Up",
+  "pokemob.move.first-impression": "First Impression",
+  "pokemob.move.baneful-bunker": "Baneful Bunker",
+  "pokemob.move.spirit-shackle": "Spirit Shackle",
+  "pokemob.move.darkest-lariat": "Darkest Lariat",
+  "pokemob.move.sparkling-aria": "Sparkling Aria",
+  "pokemob.move.ice-hammer": "Ice Hammer",
+  "pokemob.move.floral-healing": "Floral Healing",
+  "pokemob.move.high-horsepower": "High Horsepower",
+  "pokemob.move.strength-sap": "Strength Sap",
+  "pokemob.move.solar-blade": "Solar Blade",
+  "pokemob.move.leafage": "Leafage",
+  "pokemob.move.spotlight": "Spotlight",
+  "pokemob.move.toxic-thread": "Toxic Thread",
+  "pokemob.move.laser-focus": "Laser Focus",
+  "pokemob.move.gear-up": "Gear Up",
+  "pokemob.move.throat-chop": "Throat Chop",
+  "pokemob.move.pollen-puff": "Pollen Puff",
+  "pokemob.move.anchor-shot": "Anchor Shot",
+  "pokemob.move.psychic-terrain": "Psychic Terrain",
+  "pokemob.move.lunge": "Lunge",
+  "pokemob.move.fire-lash": "Fire Lash",
+  "pokemob.move.power-trip": "Power Trip",
+  "pokemob.move.burn-up": "Burn Up",
+  "pokemob.move.speed-swap": "Speed Swap",
+  "pokemob.move.smart-strike": "Smart Strike",
+  "pokemob.move.purify": "Purify",
+  "pokemob.move.revelation-dance": "Revelation Dance",
+  "pokemob.move.core-enforcer": "Core Enforcer",
+  "pokemob.move.trop-kick": "Trop Kick",
+  "pokemob.move.instruct": "Instruct",
+  "pokemob.move.beak-blast": "Beak Blast",
+  "pokemob.move.clanging-scales": "Clanging Scales",
+  "pokemob.move.dragon-hammer": "Dragon Hammer",
+  "pokemob.move.brutal-swing": "Brutal Swing",
+  "pokemob.move.aurora-veil": "Aurora Veil",
+  "pokemob.move.sinister-arrow-raid": "Sinister Arrow Raid",
+  "pokemob.move.malicious-moonsault": "Malicious Moonsault",
+  "pokemob.move.oceanic-operetta": "Oceanic Operetta",
+  "pokemob.move.guardian-of-alola": "Guardian of Alola",
+  "pokemob.move.soul-stealing-7-star-strike": "Soul-Stealing 7-Star Strike",
+  "pokemob.move.stoked-sparksurfer": "Stoked Sparksurfer",
+  "pokemob.move.pulverizing-pancake": "Pulverizing Pancake",
+  "pokemob.move.extreme-evoboost": "Extreme Evoboost",
+  "pokemob.move.genesis-supernova": "Genesis Supernova",
+  "pokemob.move.shell-trap": "Shell Trap",
+  "pokemob.move.fleur-cannon": "Fleur Cannon",
+  "pokemob.move.psychic-fangs": "Psychic Fangs",
+  "pokemob.move.stomping-tantrum": "Stomping Tantrum",
+  "pokemob.move.shadow-bone": "Shadow Bone",
+  "pokemob.move.accelerock": "Accelerock",
+  "pokemob.move.liquidation": "Liquidation",
+  "pokemob.move.prismatic-laser": "Prismatic Laser",
+  "pokemob.move.spectral-thief": "Spectral Thief",
+  "pokemob.move.sunsteel-strike": "Sunsteel Strike",
+  "pokemob.move.moongeist-beam": "Moongeist Beam",
+  "pokemob.move.tearful-look": "Tearful Look",
+  "pokemob.move.zing-zap": "Zing Zap",
+  "pokemob.move.natures-madness": "Nature’s Madness",
+  "pokemob.move.multi-attack": "Multi-Attack",
+  "pokemob.move.10-000-000-volt-thunderbolt": "10,000,000 Volt Thunderbolt",
+  "pokemob.move.mind-blown": "Mind Blown",
+  "pokemob.move.plasma-fists": "Plasma Fists",
+  "pokemob.move.photon-geyser": "Photon Geyser",
+  "pokemob.move.light-that-burns-the-sky": "Light That Burns the Sky",
+  "pokemob.move.searing-sunraze-smash": "Searing Sunraze Smash",
+  "pokemob.move.menacing-moonraze-maelstrom": "Menacing Moonraze Maelstrom",
+  "pokemob.move.lets-snuggle-forever": "Let’s Snuggle Forever",
+  "pokemob.move.splintered-stormshards": "Splintered Stormshards",
+  "pokemob.move.clangorous-soulblaze": "Clangorous Soulblaze",
+  "pokemob.move.zippy-zap": "Zippy Zap",
+  "pokemob.move.splishy-splash": "Splishy Splash",
+  "pokemob.move.floaty-fall": "Floaty Fall",
+  "pokemob.move.pika-papow": "Pika Papow",
+  "pokemob.move.bouncy-bubble": "Bouncy Bubble",
+  "pokemob.move.buzzy-buzz": "Buzzy Buzz",
+  "pokemob.move.sizzly-slide": "Sizzly Slide",
+  "pokemob.move.glitzy-glow": "Glitzy Glow",
+  "pokemob.move.baddy-bad": "Baddy Bad",
+  "pokemob.move.sappy-seed": "Sappy Seed",
+  "pokemob.move.freezy-frost": "Freezy Frost",
+  "pokemob.move.sparkly-swirl": "Sparkly Swirl",
+  "pokemob.move.veevee-volley": "Veevee Volley",
+  "pokemob.move.double-iron-bash": "Double Iron Bash",
+  "pokemob.move.max-guard": "Max Guard",
+  "pokemob.move.dynamax-cannon": "Dynamax Cannon",
+  "pokemob.move.snipe-shot": "Snipe Shot",
+  "pokemob.move.jaw-lock": "Jaw Lock",
+  "pokemob.move.stuff-cheeks": "Stuff Cheeks",
+  "pokemob.move.no-retreat": "No Retreat",
+  "pokemob.move.tar-shot": "Tar Shot",
+  "pokemob.move.magic-powder": "Magic Powder",
+  "pokemob.move.dragon-darts": "Dragon Darts",
+  "pokemob.move.teatime": "Teatime",
+  "pokemob.move.octolock": "Octolock",
+  "pokemob.move.bolt-beak": "Bolt Beak",
+  "pokemob.move.fishious-rend": "Fishious Rend",
+  "pokemob.move.court-change": "Court Change",
+  "pokemob.move.max-flare": "Max Flare",
+  "pokemob.move.max-flutterby": "Max Flutterby",
+  "pokemob.move.max-lightning": "Max Lightning",
+  "pokemob.move.max-strike": "Max Strike",
+  "pokemob.move.max-knuckle": "Max Knuckle",
+  "pokemob.move.max-phantasm": "Max Phantasm",
+  "pokemob.move.max-hailstorm": "Max Hailstorm",
+  "pokemob.move.max-ooze": "Max Ooze",
+  "pokemob.move.max-geyser": "Max Geyser",
+  "pokemob.move.max-airstream": "Max Airstream",
+  "pokemob.move.max-starfall": "Max Starfall",
+  "pokemob.move.max-wyrmwind": "Max Wyrmwind",
+  "pokemob.move.max-mindstorm": "Max Mindstorm",
+  "pokemob.move.max-rockfall": "Max Rockfall",
+  "pokemob.move.max-quake": "Max Quake",
+  "pokemob.move.max-darkness": "Max Darkness",
+  "pokemob.move.max-overgrowth": "Max Overgrowth",
+  "pokemob.move.max-steelspike": "Max Steelspike",
+  "pokemob.move.clangorous-soul": "Clangorous Soul",
+  "pokemob.move.body-press": "Body Press",
+  "pokemob.move.decorate": "Decorate",
+  "pokemob.move.drum-beating": "Drum Beating",
+  "pokemob.move.snap-trap": "Snap Trap",
+  "pokemob.move.pyro-ball": "Pyro Ball",
+  "pokemob.move.behemoth-blade": "Behemoth Blade",
+  "pokemob.move.behemoth-bash": "Behemoth Bash",
+  "pokemob.move.aura-wheel": "Aura Wheel",
+  "pokemob.move.breaking-swipe": "Breaking Swipe",
+  "pokemob.move.branch-poke": "Branch Poke",
+  "pokemob.move.overdrive": "Overdrive",
+  "pokemob.move.apple-acid": "Apple Acid",
+  "pokemob.move.grav-apple": "Grav Apple",
+  "pokemob.move.spirit-break": "Spirit Break",
+  "pokemob.move.strange-steam": "Strange Steam",
+  "pokemob.move.life-dew": "Life Dew",
+  "pokemob.move.obstruct": "Obstruct",
+  "pokemob.move.false-surrender": "False Surrender",
+  "pokemob.move.meteor-assault": "Meteor Assault",
+  "pokemob.move.eternabeam": "Eternabeam",
+  "pokemob.move.steel-beam": "Steel Beam",
+  "pokemob.move.expanding-force": "Expanding Force",
+  "pokemob.move.steel-roller": "Steel Roller",
+  "pokemob.move.scale-shot": "Scale Shot",
+  "pokemob.move.meteor-beam": "Meteor Beam",
+  "pokemob.move.shell-side-arm": "Shell Side Arm",
+  "pokemob.move.misty-explosion": "Misty Explosion",
+  "pokemob.move.grassy-glide": "Grassy Glide",
+  "pokemob.move.rising-voltage": "Rising Voltage",
+  "pokemob.move.terrain-pulse": "Terrain Pulse",
+  "pokemob.move.skitter-smack": "Skitter Smack",
+  "pokemob.move.burning-jealousy": "Burning Jealousy",
+  "pokemob.move.lash-out": "Lash Out",
+  "pokemob.move.poltergeist": "Poltergeist",
+  "pokemob.move.corrosive-gas": "Corrosive Gas",
+  "pokemob.move.coaching": "Coaching",
+  "pokemob.move.flip-turn": "Flip Turn",
+  "pokemob.move.triple-axel": "Triple Axel",
+  "pokemob.move.dual-wingbeat": "Dual Wingbeat",
+  "pokemob.move.scorching-sands": "Scorching Sands",
+  "pokemob.move.jungle-healing": "Jungle Healing",
+  "pokemob.move.wicked-blow": "Wicked Blow",
+  "pokemob.move.surging-strikes": "Surging Strikes",
+  "pokemob.move.thunder-cage": "Thunder Cage",
+  "pokemob.move.dragon-energy": "Dragon Energy",
+  "pokemob.move.freezing-glare": "Freezing Glare",
+  "pokemob.move.fiery-wrath": "Fiery Wrath",
+  "pokemob.move.thunderous-kick": "Thunderous Kick",
+  "pokemob.move.glacial-lance": "Glacial Lance",
+  "pokemob.move.astral-barrage": "Astral Barrage",
+  "pokemob.move.eerie-spell": "Eerie Spell",
+  "pokemob.move.shadow-rush": "Shadow Rush",
+  "pokemob.move.shadow-blast": "Shadow Blast",
+  "pokemob.move.shadow-blitz": "Shadow Blitz",
+  "pokemob.move.shadow-bolt": "Shadow Bolt",
+  "pokemob.move.shadow-break": "Shadow Break",
+  "pokemob.move.shadow-chill": "Shadow Chill",
+  "pokemob.move.shadow-end": "Shadow End",
+  "pokemob.move.shadow-fire": "Shadow Fire",
+  "pokemob.move.shadow-rave": "Shadow Rave",
+  "pokemob.move.shadow-storm": "Shadow Storm",
+  "pokemob.move.shadow-wave": "Shadow Wave",
+  "pokemob.move.shadow-down": "Shadow Down",
+  "pokemob.move.shadow-half": "Shadow Half",
+  "pokemob.move.shadow-hold": "Shadow Hold",
+  "pokemob.move.shadow-mist": "Shadow Mist",
+  "pokemob.move.shadow-panic": "Shadow Panic",
+  "pokemob.move.shadow-shed": "Shadow Shed",
+  "pokemob.move.shadow-sky": "Shadow Sky"
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/es_es.json b/src/main/resources/assets/pokecube_moves/lang/es_es.json
new file mode 100644
index 0000000000..992e4a34eb
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/es_es.json
@@ -0,0 +1,846 @@
+{
+  "pokemob.move.pound": "Destructor",
+  "pokemob.move.karate-chop": "Golpe Kárate",
+  "pokemob.move.double-slap": "Doble Bofetón",
+  "pokemob.move.comet-punch": "Puño Cometa",
+  "pokemob.move.mega-punch": "Megapuño",
+  "pokemob.move.pay-day": "Día de Pago",
+  "pokemob.move.fire-punch": "Puño Fuego",
+  "pokemob.move.ice-punch": "Puño Hielo",
+  "pokemob.move.thunder-punch": "Puño Trueno",
+  "pokemob.move.scratch": "Arañazo",
+  "pokemob.move.vice-grip": "Agarre",
+  "pokemob.move.guillotine": "Guillotina",
+  "pokemob.move.razor-wind": "Viento Cortante",
+  "pokemob.move.swords-dance": "Danza Espada",
+  "pokemob.move.cut": "Corte",
+  "pokemob.move.gust": "Tornado",
+  "pokemob.move.wing-attack": "Ataque Ala",
+  "pokemob.move.whirlwind": "Remolino",
+  "pokemob.move.fly": "Vuelo",
+  "pokemob.move.bind": "Atadura",
+  "pokemob.move.slam": "Atizar",
+  "pokemob.move.vine-whip": "Látigo Cepa",
+  "pokemob.move.stomp": "Pisotón",
+  "pokemob.move.double-kick": "Doble Patada",
+  "pokemob.move.mega-kick": "Megapatada",
+  "pokemob.move.jump-kick": "Patada Salto",
+  "pokemob.move.rolling-kick": "Patada Giro",
+  "pokemob.move.sand-attack": "Ataque Arena",
+  "pokemob.move.headbutt": "Golpe Cabeza",
+  "pokemob.move.horn-attack": "Cornada",
+  "pokemob.move.fury-attack": "Ataque Furia",
+  "pokemob.move.horn-drill": "Perforador",
+  "pokemob.move.tackle": "Placaje",
+  "pokemob.move.body-slam": "Golpe Cuerpo",
+  "pokemob.move.wrap": "Constricción",
+  "pokemob.move.take-down": "Derribo",
+  "pokemob.move.thrash": "Golpe",
+  "pokemob.move.double-edge": "Doble Filo",
+  "pokemob.move.tail-whip": "Látigo",
+  "pokemob.move.poison-sting": "Picotazo Veneno",
+  "pokemob.move.twineedle": "Doble Ataque",
+  "pokemob.move.pin-missile": "Pin Misil",
+  "pokemob.move.leer": "Malicioso",
+  "pokemob.move.bite": "Mordisco",
+  "pokemob.move.growl": "Gruñido",
+  "pokemob.move.roar": "Rugido",
+  "pokemob.move.sing": "Canto",
+  "pokemob.move.supersonic": "Supersónico",
+  "pokemob.move.sonic-boom": "Bomba Sónica",
+  "pokemob.move.disable": "Anulación",
+  "pokemob.move.acid": "Ácido",
+  "pokemob.move.ember": "Ascuas",
+  "pokemob.move.flamethrower": "Lanzallamas",
+  "pokemob.move.mist": "Neblina",
+  "pokemob.move.water-gun": "Pistola Agua",
+  "pokemob.move.hydro-pump": "Hidrobomba",
+  "pokemob.move.surf": "Surf",
+  "pokemob.move.ice-beam": "Rayo Hielo",
+  "pokemob.move.blizzard": "Ventisca",
+  "pokemob.move.psybeam": "Psicorrayo",
+  "pokemob.move.bubble-beam": "Rayo Burbuja",
+  "pokemob.move.aurora-beam": "Rayo Aurora",
+  "pokemob.move.hyper-beam": "Hiperrayo",
+  "pokemob.move.peck": "Picotazo",
+  "pokemob.move.drill-peck": "Pico Taladro",
+  "pokemob.move.submission": "Sumisión",
+  "pokemob.move.low-kick": "Patada Baja",
+  "pokemob.move.counter": "Contraataque",
+  "pokemob.move.seismic-toss": "Sísmico",
+  "pokemob.move.strength": "Fuerza",
+  "pokemob.move.absorb": "Absorber",
+  "pokemob.move.mega-drain": "Megaagotar",
+  "pokemob.move.leech-seed": "Drenadoras",
+  "pokemob.move.growth": "Desarrollo",
+  "pokemob.move.razor-leaf": "Hoja Afilada",
+  "pokemob.move.solar-beam": "Rayo Solar",
+  "pokemob.move.poison-powder": "Polvo Veneno",
+  "pokemob.move.stun-spore": "Paralizador",
+  "pokemob.move.sleep-powder": "Somnífero",
+  "pokemob.move.petal-dance": "Danza Pétalo",
+  "pokemob.move.string-shot": "Disparo Demora",
+  "pokemob.move.dragon-rage": "Furia Dragón",
+  "pokemob.move.fire-spin": "Giro Fuego",
+  "pokemob.move.thunder-shock": "Impactrueno",
+  "pokemob.move.thunderbolt": "Rayo",
+  "pokemob.move.thunder-wave": "Onda Trueno",
+  "pokemob.move.thunder": "Trueno",
+  "pokemob.move.rock-throw": "Lanzarrocas",
+  "pokemob.move.earthquake": "Terremoto",
+  "pokemob.move.fissure": "Fisura",
+  "pokemob.move.dig": "Excavar",
+  "pokemob.move.toxic": "Tóxico",
+  "pokemob.move.confusion": "Confusión",
+  "pokemob.move.psychic": "Psíquico",
+  "pokemob.move.hypnosis": "Hipnosis",
+  "pokemob.move.meditate": "Meditación",
+  "pokemob.move.agility": "Agilidad",
+  "pokemob.move.quick-attack": "Ataque Rápido",
+  "pokemob.move.rage": "Furia",
+  "pokemob.move.teleport": "Teletransporte",
+  "pokemob.move.night-shade": "Tinieblas",
+  "pokemob.move.mimic": "Mimético",
+  "pokemob.move.screech": "Chirrido",
+  "pokemob.move.double-team": "Doble Equipo",
+  "pokemob.move.recover": "Recuperación",
+  "pokemob.move.harden": "Fortaleza",
+  "pokemob.move.minimize": "Reducción",
+  "pokemob.move.smokescreen": "Pantalla de Humo",
+  "pokemob.move.confuse-ray": "Rayo Confuso",
+  "pokemob.move.withdraw": "Refugio",
+  "pokemob.move.defense-curl": "Rizo Defensa",
+  "pokemob.move.barrier": "Barrera",
+  "pokemob.move.light-screen": "Pantalla de Luz",
+  "pokemob.move.haze": "Niebla",
+  "pokemob.move.reflect": "Reflejo",
+  "pokemob.move.focus-energy": "Foco Energía",
+  "pokemob.move.bide": "Venganza",
+  "pokemob.move.metronome": "Metrónomo",
+  "pokemob.move.mirror-move": "Espejo",
+  "pokemob.move.self-destruct": "Autodestrucción",
+  "pokemob.move.egg-bomb": "Bomba Huevo",
+  "pokemob.move.lick": "Lengüetazo",
+  "pokemob.move.smog": "Polución",
+  "pokemob.move.sludge": "Residuos",
+  "pokemob.move.bone-club": "Hueso Palo",
+  "pokemob.move.fire-blast": "Llamarada",
+  "pokemob.move.waterfall": "Cascada",
+  "pokemob.move.clamp": "Tenaza",
+  "pokemob.move.swift": "Rapidez",
+  "pokemob.move.skull-bash": "Cabezazo",
+  "pokemob.move.spike-cannon": "Clavo Cañón",
+  "pokemob.move.constrict": "Restricción",
+  "pokemob.move.amnesia": "Amnesia",
+  "pokemob.move.kinesis": "Kinético",
+  "pokemob.move.soft-boiled": "Amortiguador",
+  "pokemob.move.high-jump-kick": "Pat. Salto Alta",
+  "pokemob.move.glare": "Deslumbrar",
+  "pokemob.move.dream-eater": "Comesueños",
+  "pokemob.move.poison-gas": "Gas Venenoso",
+  "pokemob.move.barrage": "Bombardeo",
+  "pokemob.move.leech-life": "Chupavidas",
+  "pokemob.move.lovely-kiss": "Beso Amoroso",
+  "pokemob.move.sky-attack": "Ataque Aéreo",
+  "pokemob.move.transform": "Transformación",
+  "pokemob.move.bubble": "Burbuja",
+  "pokemob.move.dizzy-punch": "Puño Mareo",
+  "pokemob.move.spore": "Espora",
+  "pokemob.move.flash": "Destello",
+  "pokemob.move.psywave": "Psicoonda",
+  "pokemob.move.splash": "Salpicadura",
+  "pokemob.move.acid-armor": "Armadura Ácida",
+  "pokemob.move.crabhammer": "Martillazo",
+  "pokemob.move.explosion": "Explosión",
+  "pokemob.move.fury-swipes": "Golpes Furia",
+  "pokemob.move.bonemerang": "Huesomerang",
+  "pokemob.move.rest": "Descanso",
+  "pokemob.move.rock-slide": "Avalancha",
+  "pokemob.move.hyper-fang": "Hipercolmillo",
+  "pokemob.move.sharpen": "Afilar",
+  "pokemob.move.conversion": "Conversión",
+  "pokemob.move.tri-attack": "Triataque",
+  "pokemob.move.super-fang": "Superdiente",
+  "pokemob.move.slash": "Cuchillada",
+  "pokemob.move.substitute": "Sustituto",
+  "pokemob.move.struggle": "Forcejeo",
+  "pokemob.move.sketch": "Esquema",
+  "pokemob.move.triple-kick": "Triple Patada",
+  "pokemob.move.thief": "Ladrón",
+  "pokemob.move.spider-web": "Telaraña",
+  "pokemob.move.mind-reader": "Telépata",
+  "pokemob.move.nightmare": "Pesadilla",
+  "pokemob.move.flame-wheel": "Rueda Fuego",
+  "pokemob.move.snore": "Ronquido",
+  "pokemob.move.curse": "Maldición",
+  "pokemob.move.flail": "Azote",
+  "pokemob.move.conversion-2": "Conversión2",
+  "pokemob.move.aeroblast": "Aerochorro",
+  "pokemob.move.cotton-spore": "Esporagodón",
+  "pokemob.move.reversal": "Inversión",
+  "pokemob.move.spite": "Rencor",
+  "pokemob.move.powder-snow": "Nieve Polvo",
+  "pokemob.move.protect": "Protección",
+  "pokemob.move.mach-punch": "Ultrapuño",
+  "pokemob.move.scary-face": "Cara Susto",
+  "pokemob.move.feint-attack": "Finta",
+  "pokemob.move.sweet-kiss": "Beso Dulce",
+  "pokemob.move.belly-drum": "Tambor",
+  "pokemob.move.sludge-bomb": "Bomba Lodo",
+  "pokemob.move.mud-slap": "Bofetón Lodo",
+  "pokemob.move.octazooka": "Pulpocañón",
+  "pokemob.move.spikes": "Púas",
+  "pokemob.move.zap-cannon": "Electrocañón",
+  "pokemob.move.foresight": "Profecía",
+  "pokemob.move.destiny-bond": "Mismo Destino",
+  "pokemob.move.perish-song": "Canto Mortal",
+  "pokemob.move.icy-wind": "Viento Hielo",
+  "pokemob.move.detect": "Detección",
+  "pokemob.move.bone-rush": "Ataque Óseo",
+  "pokemob.move.lock-on": "Fijar Blanco",
+  "pokemob.move.outrage": "Enfado",
+  "pokemob.move.sandstorm": "Tormenta Arena",
+  "pokemob.move.giga-drain": "Gigadrenado",
+  "pokemob.move.endure": "Aguante",
+  "pokemob.move.charm": "Encanto",
+  "pokemob.move.rollout": "Rodar",
+  "pokemob.move.false-swipe": "Falso Tortazo",
+  "pokemob.move.swagger": "Contoneo",
+  "pokemob.move.milk-drink": "Batido",
+  "pokemob.move.spark": "Chispa",
+  "pokemob.move.fury-cutter": "Corte Furia",
+  "pokemob.move.steel-wing": "Ala de Acero",
+  "pokemob.move.mean-look": "Mal de Ojo",
+  "pokemob.move.attract": "Atracción",
+  "pokemob.move.sleep-talk": "Sonámbulo",
+  "pokemob.move.heal-bell": "Campana Cura",
+  "pokemob.move.return": "Retribución",
+  "pokemob.move.present": "Presente",
+  "pokemob.move.frustration": "Frustración",
+  "pokemob.move.safeguard": "Velo Sagrado",
+  "pokemob.move.pain-split": "Divide Dolor",
+  "pokemob.move.sacred-fire": "Fuego Sagrado",
+  "pokemob.move.magnitude": "Magnitud",
+  "pokemob.move.dynamic-punch": "Puño Dinámico",
+  "pokemob.move.megahorn": "Megacuerno",
+  "pokemob.move.dragon-breath": "Dragoaliento",
+  "pokemob.move.baton-pass": "Relevo",
+  "pokemob.move.encore": "Otra Vez",
+  "pokemob.move.pursuit": "Persecución",
+  "pokemob.move.rapid-spin": "Giro Rápido",
+  "pokemob.move.sweet-scent": "Dulce Aroma",
+  "pokemob.move.iron-tail": "Cola Férrea",
+  "pokemob.move.metal-claw": "Garra Metal",
+  "pokemob.move.vital-throw": "Tiro Vital",
+  "pokemob.move.morning-sun": "Sol Matinal",
+  "pokemob.move.synthesis": "Síntesis",
+  "pokemob.move.moonlight": "Luz Lunar",
+  "pokemob.move.hidden-power": "Poder Oculto",
+  "pokemob.move.cross-chop": "Tajo Cruzado",
+  "pokemob.move.twister": "Ciclón",
+  "pokemob.move.rain-dance": "Danza Lluvia",
+  "pokemob.move.sunny-day": "Día Soleado",
+  "pokemob.move.crunch": "Triturar",
+  "pokemob.move.mirror-coat": "Manto Espejo",
+  "pokemob.move.psych-up": "Más Psique",
+  "pokemob.move.extreme-speed": "Veloc. Extrema",
+  "pokemob.move.ancient-power": "Poder Pasado",
+  "pokemob.move.shadow-ball": "Bola Sombra",
+  "pokemob.move.future-sight": "Premonición",
+  "pokemob.move.rock-smash": "Golpe Roca",
+  "pokemob.move.whirlpool": "Torbellino",
+  "pokemob.move.beat-up": "Paliza",
+  "pokemob.move.fake-out": "Sorpresa",
+  "pokemob.move.uproar": "Alboroto",
+  "pokemob.move.stockpile": "Reserva",
+  "pokemob.move.spit-up": "Escupir",
+  "pokemob.move.swallow": "Tragar",
+  "pokemob.move.heat-wave": "Onda Ígnea",
+  "pokemob.move.hail": "Granizo",
+  "pokemob.move.torment": "Tormento",
+  "pokemob.move.flatter": "Camelo",
+  "pokemob.move.will-o-wisp": "Fuego Fatuo",
+  "pokemob.move.memento": "Legado",
+  "pokemob.move.facade": "Imagen",
+  "pokemob.move.focus-punch": "Puño Certero",
+  "pokemob.move.smelling-salts": "Estímulo",
+  "pokemob.move.follow-me": "Señuelo",
+  "pokemob.move.nature-power": "Adaptación",
+  "pokemob.move.charge": "Carga",
+  "pokemob.move.taunt": "Mofa",
+  "pokemob.move.helping-hand": "Refuerzo",
+  "pokemob.move.trick": "Truco",
+  "pokemob.move.role-play": "Imitación",
+  "pokemob.move.wish": "Deseo",
+  "pokemob.move.assist": "Ayuda",
+  "pokemob.move.ingrain": "Arraigo",
+  "pokemob.move.superpower": "Fuerza Bruta",
+  "pokemob.move.magic-coat": "Capa Mágica",
+  "pokemob.move.recycle": "Reciclaje",
+  "pokemob.move.revenge": "Desquite",
+  "pokemob.move.brick-break": "Demolición",
+  "pokemob.move.yawn": "Bostezo",
+  "pokemob.move.knock-off": "Desarme",
+  "pokemob.move.endeavor": "Esfuerzo",
+  "pokemob.move.eruption": "Estallido",
+  "pokemob.move.skill-swap": "Intercambio",
+  "pokemob.move.imprison": "Sellar",
+  "pokemob.move.refresh": "Alivio",
+  "pokemob.move.grudge": "Rabia",
+  "pokemob.move.snatch": "Robo",
+  "pokemob.move.secret-power": "Daño Secreto",
+  "pokemob.move.dive": "Buceo",
+  "pokemob.move.arm-thrust": "Empujón",
+  "pokemob.move.camouflage": "Camuflaje",
+  "pokemob.move.tail-glow": "Ráfaga",
+  "pokemob.move.luster-purge": "Resplandor",
+  "pokemob.move.mist-ball": "Bola Neblina",
+  "pokemob.move.feather-dance": "Danza Pluma",
+  "pokemob.move.teeter-dance": "Danza Caos",
+  "pokemob.move.blaze-kick": "Patada Ígnea",
+  "pokemob.move.mud-sport": "Chapoteo Lodo",
+  "pokemob.move.ice-ball": "Bola Hielo",
+  "pokemob.move.needle-arm": "Brazo Pincho",
+  "pokemob.move.slack-off": "Relajo",
+  "pokemob.move.hyper-voice": "Vozarrón",
+  "pokemob.move.poison-fang": "Colmillo Veneno",
+  "pokemob.move.crush-claw": "Garra Brutal",
+  "pokemob.move.blast-burn": "Anillo Ígneo",
+  "pokemob.move.hydro-cannon": "Hidrocañón",
+  "pokemob.move.meteor-mash": "Puño Meteoro",
+  "pokemob.move.astonish": "Impresionar",
+  "pokemob.move.weather-ball": "Meteorobola",
+  "pokemob.move.aromatherapy": "Aromaterapia",
+  "pokemob.move.fake-tears": "Llanto Falso",
+  "pokemob.move.air-cutter": "Aire Afilado",
+  "pokemob.move.overheat": "Sofoco",
+  "pokemob.move.odor-sleuth": "Rastreo",
+  "pokemob.move.rock-tomb": "Tumba Rocas",
+  "pokemob.move.silver-wind": "Viento Plata",
+  "pokemob.move.metal-sound": "Eco Metálico",
+  "pokemob.move.grass-whistle": "Silbato",
+  "pokemob.move.tickle": "Cosquillas",
+  "pokemob.move.cosmic-power": "Masa Cósmica",
+  "pokemob.move.water-spout": "Salpicar",
+  "pokemob.move.signal-beam": "Doble Rayo",
+  "pokemob.move.shadow-punch": "Puño Sombra",
+  "pokemob.move.extrasensory": "Paranormal",
+  "pokemob.move.sky-uppercut": "Gancho Alto",
+  "pokemob.move.sand-tomb": "Bucle Arena",
+  "pokemob.move.sheer-cold": "Frío Polar",
+  "pokemob.move.muddy-water": "Agua Lodosa",
+  "pokemob.move.bullet-seed": "Semilladora",
+  "pokemob.move.aerial-ace": "Golpe Aéreo",
+  "pokemob.move.icicle-spear": "Carámbano",
+  "pokemob.move.iron-defense": "Defensa Férrea",
+  "pokemob.move.block": "Bloqueo",
+  "pokemob.move.howl": "Aullido",
+  "pokemob.move.dragon-claw": "Garra Dragón",
+  "pokemob.move.frenzy-plant": "Planta Feroz",
+  "pokemob.move.bulk-up": "Corpulencia",
+  "pokemob.move.bounce": "Bote",
+  "pokemob.move.mud-shot": "Disparo Lodo",
+  "pokemob.move.poison-tail": "Cola Veneno",
+  "pokemob.move.covet": "Antojo",
+  "pokemob.move.volt-tackle": "Placaje Eléc",
+  "pokemob.move.magical-leaf": "Hoja Mágica",
+  "pokemob.move.water-sport": "Hidrochorro",
+  "pokemob.move.calm-mind": "Paz Mental",
+  "pokemob.move.leaf-blade": "Hoja Aguda",
+  "pokemob.move.dragon-dance": "Danza Dragón",
+  "pokemob.move.rock-blast": "Pedrada",
+  "pokemob.move.shock-wave": "Onda Voltio",
+  "pokemob.move.water-pulse": "Hidropulso",
+  "pokemob.move.doom-desire": "Deseo Oculto",
+  "pokemob.move.psycho-boost": "Psicoataque",
+  "pokemob.move.roost": "Respiro",
+  "pokemob.move.gravity": "Gravedad",
+  "pokemob.move.miracle-eye": "Gran Ojo",
+  "pokemob.move.wake-up-slap": "Espabila",
+  "pokemob.move.hammer-arm": "Machada",
+  "pokemob.move.gyro-ball": "Giro Bola",
+  "pokemob.move.healing-wish": "Deseo Cura",
+  "pokemob.move.brine": "Salmuera",
+  "pokemob.move.natural-gift": "Don Natural",
+  "pokemob.move.feint": "Amago",
+  "pokemob.move.pluck": "Picoteo",
+  "pokemob.move.tailwind": "Viento Afín",
+  "pokemob.move.acupressure": "Acupresión",
+  "pokemob.move.metal-burst": "Represión Metal",
+  "pokemob.move.u-turn": "Ida y Vuelta",
+  "pokemob.move.close-combat": "A Bocajarro",
+  "pokemob.move.payback": "Vendetta",
+  "pokemob.move.assurance": "Buena Baza",
+  "pokemob.move.embargo": "Embargo",
+  "pokemob.move.fling": "Lanzamiento",
+  "pokemob.move.psycho-shift": "Psicocambio",
+  "pokemob.move.trump-card": "As Oculto",
+  "pokemob.move.heal-block": "Anticura",
+  "pokemob.move.wring-out": "Estrujón",
+  "pokemob.move.power-trick": "Truco Fuerza",
+  "pokemob.move.gastro-acid": "Bilis",
+  "pokemob.move.lucky-chant": "Conjuro",
+  "pokemob.move.me-first": "Yo Primero",
+  "pokemob.move.copycat": "Copión",
+  "pokemob.move.power-swap": "Cambiafuerza",
+  "pokemob.move.guard-swap": "Cambiadefensa",
+  "pokemob.move.punishment": "Castigo",
+  "pokemob.move.last-resort": "Última Baza",
+  "pokemob.move.worry-seed": "Abatidoras",
+  "pokemob.move.sucker-punch": "Golpe Bajo",
+  "pokemob.move.toxic-spikes": "Púas Tóxicas",
+  "pokemob.move.heart-swap": "Cambia Almas",
+  "pokemob.move.aqua-ring": "Acua Aro",
+  "pokemob.move.magnet-rise": "Levitón",
+  "pokemob.move.flare-blitz": "Envite Ígneo",
+  "pokemob.move.force-palm": "Palmeo",
+  "pokemob.move.aura-sphere": "Esfera Aural",
+  "pokemob.move.rock-polish": "Pulimento",
+  "pokemob.move.poison-jab": "Puya Nociva",
+  "pokemob.move.dark-pulse": "Pulso Umbrío",
+  "pokemob.move.night-slash": "Tajo Umbrío",
+  "pokemob.move.aqua-tail": "Acua Cola",
+  "pokemob.move.seed-bomb": "Bomba Germen",
+  "pokemob.move.air-slash": "Tajo Aéreo",
+  "pokemob.move.x-scissor": "Tijera X",
+  "pokemob.move.bug-buzz": "Zumbido",
+  "pokemob.move.dragon-pulse": "Pulso Dragón",
+  "pokemob.move.dragon-rush": "Carga Dragón",
+  "pokemob.move.power-gem": "Joya de Luz",
+  "pokemob.move.drain-punch": "Puño Drenaje",
+  "pokemob.move.vacuum-wave": "Onda Vacío",
+  "pokemob.move.focus-blast": "Onda Certera",
+  "pokemob.move.energy-ball": "Energibola",
+  "pokemob.move.brave-bird": "Pájaro Osado",
+  "pokemob.move.earth-power": "Tierra Viva",
+  "pokemob.move.switcheroo": "Trapicheo",
+  "pokemob.move.giga-impact": "Gigaimpacto",
+  "pokemob.move.nasty-plot": "Maquinación",
+  "pokemob.move.bullet-punch": "Puño Bala",
+  "pokemob.move.avalanche": "Alud",
+  "pokemob.move.ice-shard": "Canto Helado",
+  "pokemob.move.shadow-claw": "Garra Umbría",
+  "pokemob.move.thunder-fang": "Colmillo Rayo",
+  "pokemob.move.ice-fang": "Colmillo Hielo",
+  "pokemob.move.fire-fang": "Colmillo Ígneo",
+  "pokemob.move.shadow-sneak": "Sombra Vil",
+  "pokemob.move.mud-bomb": "Bomba Fango",
+  "pokemob.move.psycho-cut": "Psicocorte",
+  "pokemob.move.zen-headbutt": "Cabezazo Zen",
+  "pokemob.move.mirror-shot": "Disparo Espejo",
+  "pokemob.move.flash-cannon": "Foco Resplandor",
+  "pokemob.move.rock-climb": "Treparrocas",
+  "pokemob.move.defog": "Despejar",
+  "pokemob.move.trick-room": "Espacio Raro",
+  "pokemob.move.draco-meteor": "Cometa Draco",
+  "pokemob.move.discharge": "Chispazo",
+  "pokemob.move.lava-plume": "Humareda",
+  "pokemob.move.leaf-storm": "Lluevehojas",
+  "pokemob.move.power-whip": "Latigazo",
+  "pokemob.move.rock-wrecker": "Romperrocas",
+  "pokemob.move.cross-poison": "Veneno X",
+  "pokemob.move.gunk-shot": "Lanzamugre",
+  "pokemob.move.iron-head": "Cabeza de Hierro",
+  "pokemob.move.magnet-bomb": "Bomba Imán",
+  "pokemob.move.stone-edge": "Roca Afilada",
+  "pokemob.move.captivate": "Seducción",
+  "pokemob.move.stealth-rock": "Trampa Rocas",
+  "pokemob.move.grass-knot": "Hierba Lazo",
+  "pokemob.move.chatter": "Cháchara",
+  "pokemob.move.judgment": "Sentencia",
+  "pokemob.move.bug-bite": "Picadura",
+  "pokemob.move.charge-beam": "Rayo Carga",
+  "pokemob.move.wood-hammer": "Mazazo",
+  "pokemob.move.aqua-jet": "Acua Jet",
+  "pokemob.move.attack-order": "Al Ataque",
+  "pokemob.move.defend-order": "A Defender",
+  "pokemob.move.heal-order": "Auxilio",
+  "pokemob.move.head-smash": "Testarazo",
+  "pokemob.move.double-hit": "Doble Golpe",
+  "pokemob.move.roar-of-time": "Distorsión",
+  "pokemob.move.spacial-rend": "Corte Vacío",
+  "pokemob.move.lunar-dance": "Danza Lunar",
+  "pokemob.move.crush-grip": "Agarrón",
+  "pokemob.move.magma-storm": "Lluvia Ígnea",
+  "pokemob.move.dark-void": "Brecha Negra",
+  "pokemob.move.seed-flare": "Fogonazo",
+  "pokemob.move.ominous-wind": "Viento Aciago",
+  "pokemob.move.shadow-force": "Golpe Umbrío",
+  "pokemob.move.hone-claws": "Afilagarras",
+  "pokemob.move.wide-guard": "Vastaguardia",
+  "pokemob.move.guard-split": "Isoguardia",
+  "pokemob.move.power-split": "Isofuerza",
+  "pokemob.move.wonder-room": "Zona Extraña",
+  "pokemob.move.psyshock": "Psicocarga",
+  "pokemob.move.venoshock": "Carga Tóxica",
+  "pokemob.move.autotomize": "Aligerar",
+  "pokemob.move.rage-powder": "Polvo Ira",
+  "pokemob.move.telekinesis": "Telequinesis",
+  "pokemob.move.magic-room": "Zona Mágica",
+  "pokemob.move.smack-down": "Antiaéreo",
+  "pokemob.move.storm-throw": "Llave Corsé",
+  "pokemob.move.flame-burst": "Pirotecnia",
+  "pokemob.move.sludge-wave": "Onda Tóxica",
+  "pokemob.move.quiver-dance": "Danza Aleteo",
+  "pokemob.move.heavy-slam": "Cuerpo Pesado",
+  "pokemob.move.synchronoise": "Sincrorruido",
+  "pokemob.move.electro-ball": "Bola Voltio",
+  "pokemob.move.soak": "Anegar",
+  "pokemob.move.flame-charge": "Nitrocarga",
+  "pokemob.move.coil": "Enrosque",
+  "pokemob.move.low-sweep": "Puntapié",
+  "pokemob.move.acid-spray": "Bomba Ácida",
+  "pokemob.move.foul-play": "Juego Sucio",
+  "pokemob.move.simple-beam": "Onda Simple",
+  "pokemob.move.entrainment": "Danza Amiga",
+  "pokemob.move.after-you": "Cede Paso",
+  "pokemob.move.round": "Canon",
+  "pokemob.move.echoed-voice": "Eco Voz",
+  "pokemob.move.chip-away": "Guardia Baja",
+  "pokemob.move.clear-smog": "Niebla Clara",
+  "pokemob.move.stored-power": "Poder Reserva",
+  "pokemob.move.quick-guard": "Anticipo",
+  "pokemob.move.ally-switch": "Cambio de Banda",
+  "pokemob.move.scald": "Escaldar",
+  "pokemob.move.shell-smash": "Rompecoraza",
+  "pokemob.move.heal-pulse": "Pulso Cura",
+  "pokemob.move.hex": "Infortunio",
+  "pokemob.move.sky-drop": "Caída Libre",
+  "pokemob.move.shift-gear": "Cambio de Marcha",
+  "pokemob.move.circle-throw": "Llave Giro",
+  "pokemob.move.incinerate": "Calcinación",
+  "pokemob.move.quash": "Último Lugar",
+  "pokemob.move.acrobatics": "Acróbata",
+  "pokemob.move.reflect-type": "Clonatipo",
+  "pokemob.move.retaliate": "Represalia",
+  "pokemob.move.final-gambit": "Sacrificio",
+  "pokemob.move.bestow": "Ofrenda",
+  "pokemob.move.inferno": "Infierno",
+  "pokemob.move.water-pledge": "Voto Agua",
+  "pokemob.move.fire-pledge": "Voto Fuego",
+  "pokemob.move.grass-pledge": "Voto Planta",
+  "pokemob.move.volt-switch": "Voltiocambio",
+  "pokemob.move.struggle-bug": "Estoicismo",
+  "pokemob.move.bulldoze": "Terratemblor",
+  "pokemob.move.frost-breath": "Vaho Gélido",
+  "pokemob.move.dragon-tail": "Cola Dragón",
+  "pokemob.move.work-up": "Avivar",
+  "pokemob.move.electroweb": "Electrotela",
+  "pokemob.move.wild-charge": "Voltio Cruel",
+  "pokemob.move.drill-run": "Taladradora",
+  "pokemob.move.dual-chop": "Golpe Bis",
+  "pokemob.move.heart-stamp": "Arrumaco",
+  "pokemob.move.horn-leech": "Asta Drenaje",
+  "pokemob.move.sacred-sword": "Espada Santa",
+  "pokemob.move.razor-shell": "Concha Filo",
+  "pokemob.move.heat-crash": "Golpe Calor",
+  "pokemob.move.leaf-tornado": "Ciclón de Hojas",
+  "pokemob.move.steamroller": "Rodillo de Púas",
+  "pokemob.move.cotton-guard": "Rizo Algodón",
+  "pokemob.move.night-daze": "Pulso Noche",
+  "pokemob.move.psystrike": "Onda Mental",
+  "pokemob.move.tail-slap": "Plumerazo",
+  "pokemob.move.hurricane": "Vendaval",
+  "pokemob.move.head-charge": "Ariete",
+  "pokemob.move.gear-grind": "Rueda Doble",
+  "pokemob.move.searing-shot": "Bomba Ígnea",
+  "pokemob.move.techno-blast": "Tecno Shock",
+  "pokemob.move.relic-song": "Canto Arcaico",
+  "pokemob.move.secret-sword": "Sable Místico",
+  "pokemob.move.glaciate": "Mundo Gélido",
+  "pokemob.move.bolt-strike": "Ataque Fulgor",
+  "pokemob.move.blue-flare": "Llama Azul",
+  "pokemob.move.fiery-dance": "Danza Llama",
+  "pokemob.move.freeze-shock": "Rayo Gélido",
+  "pokemob.move.ice-burn": "Llama Gélida",
+  "pokemob.move.snarl": "Alarido",
+  "pokemob.move.icicle-crash": "Chuzos",
+  "pokemob.move.v-create": "V de Fuego",
+  "pokemob.move.fusion-flare": "Llama Fusión",
+  "pokemob.move.fusion-bolt": "Rayo Fusión",
+  "pokemob.move.flying-press": "Plancha Voladora",
+  "pokemob.move.mat-block": "Escudo Tatami",
+  "pokemob.move.belch": "Eructo",
+  "pokemob.move.rototiller": "Fertilizante",
+  "pokemob.move.sticky-web": "Red Viscosa",
+  "pokemob.move.fell-stinger": "Aguijón Letal",
+  "pokemob.move.phantom-force": "Golpe Fantasma",
+  "pokemob.move.trick-or-treat": "Halloween",
+  "pokemob.move.noble-roar": "Rugido de Guerra",
+  "pokemob.move.ion-deluge": "Cortina Plasma",
+  "pokemob.move.parabolic-charge": "Carga Parábola",
+  "pokemob.move.forests-curse": "Condena Silvana",
+  "pokemob.move.petal-blizzard": "Tormenta Floral",
+  "pokemob.move.freeze-dry": "Liofilización",
+  "pokemob.move.disarming-voice": "Voz Cautivadora",
+  "pokemob.move.parting-shot": "Última Palabra",
+  "pokemob.move.topsy-turvy": "Reversión",
+  "pokemob.move.draining-kiss": "Beso Drenaje",
+  "pokemob.move.crafty-shield": "Truco Defensa",
+  "pokemob.move.flower-shield": "Defensa Floral",
+  "pokemob.move.grassy-terrain": "Campo de Hierba",
+  "pokemob.move.misty-terrain": "Campo de Niebla",
+  "pokemob.move.electrify": "Electrificación",
+  "pokemob.move.play-rough": "Carantoña",
+  "pokemob.move.fairy-wind": "Viento Feérico",
+  "pokemob.move.moonblast": "Fuerza Lunar",
+  "pokemob.move.boomburst": "Estruendo",
+  "pokemob.move.fairy-lock": "Cerrojo Feérico",
+  "pokemob.move.kings-shield": "Escudo Real",
+  "pokemob.move.play-nice": "Camaradería",
+  "pokemob.move.confide": "Confidencia",
+  "pokemob.move.diamond-storm": "Torm. Diamantes",
+  "pokemob.move.steam-eruption": "Chorro de Vapor",
+  "pokemob.move.hyperspace-hole": "Paso Dimensional",
+  "pokemob.move.water-shuriken": "Shuriken de Agua",
+  "pokemob.move.mystical-fire": "Llama Embrujada",
+  "pokemob.move.spiky-shield": "Barrera Espinosa",
+  "pokemob.move.aromatic-mist": "Niebla Aromática",
+  "pokemob.move.eerie-impulse": "Onda Anómala",
+  "pokemob.move.venom-drench": "Trampa Venenosa",
+  "pokemob.move.powder": "Polvo Explosivo",
+  "pokemob.move.geomancy": "Geocontrol",
+  "pokemob.move.magnetic-flux": "Aura Magnética",
+  "pokemob.move.happy-hour": "Paga Extra",
+  "pokemob.move.electric-terrain": "Campo Eléctrico",
+  "pokemob.move.dazzling-gleam": "Brillo Mágico",
+  "pokemob.move.celebrate": "Celebración",
+  "pokemob.move.hold-hands": "Manos Juntas",
+  "pokemob.move.baby-doll-eyes": "Ojitos Tiernos",
+  "pokemob.move.nuzzle": "Moflete Estático",
+  "pokemob.move.hold-back": "Clemencia",
+  "pokemob.move.infestation": "Acoso",
+  "pokemob.move.power-up-punch": "Puño Incremento",
+  "pokemob.move.oblivion-wing": "Ala Mortífera",
+  "pokemob.move.thousand-arrows": "Mil Flechas",
+  "pokemob.move.thousand-waves": "Mil Temblores",
+  "pokemob.move.lands-wrath": "Fuerza Telúrica",
+  "pokemob.move.light-of-ruin": "Luz Aniquiladora",
+  "pokemob.move.origin-pulse": "Pulso Primigenio",
+  "pokemob.move.precipice-blades": "Filo del Abismo",
+  "pokemob.move.dragon-ascent": "Ascenso Draco",
+  "pokemob.move.hyperspace-fury": "Cerco Dimensión",
+  "pokemob.move.breakneck-blitz--physical": "Carrera Arrolladora",
+  "pokemob.move.breakneck-blitz--special": "Carrera Arrolladora",
+  "pokemob.move.all-out-pummeling--physical": "Ráfaga Demoledora",
+  "pokemob.move.all-out-pummeling--special": "Ráfaga Demoledora",
+  "pokemob.move.supersonic-skystrike--physical": "Picado Supersónico",
+  "pokemob.move.supersonic-skystrike--special": "Picado Supersónico",
+  "pokemob.move.acid-downpour--physical": "Diluvio Corrosivo",
+  "pokemob.move.acid-downpour--special": "Diluvio Corrosivo",
+  "pokemob.move.tectonic-rage--physical": "Barrena Telúrica",
+  "pokemob.move.tectonic-rage--special": "Barrena Telúrica",
+  "pokemob.move.continental-crush--physical": "Aplastamiento Gigalítico",
+  "pokemob.move.continental-crush--special": "Aplastamiento Gigalítico",
+  "pokemob.move.savage-spin-out--physical": "Guadaña Sedosa",
+  "pokemob.move.savage-spin-out--special": "Guadaña Sedosa",
+  "pokemob.move.never-ending-nightmare--physical": "Presa Espectral",
+  "pokemob.move.never-ending-nightmare--special": "Presa Espectral",
+  "pokemob.move.corkscrew-crash--physical": "Hélice Trepanadora",
+  "pokemob.move.corkscrew-crash--special": "Hélice Trepanadora",
+  "pokemob.move.inferno-overdrive--physical": "Hecatombe Pírica",
+  "pokemob.move.inferno-overdrive--special": "Hecatombe Pírica",
+  "pokemob.move.hydro-vortex--physical": "Hidrovórtice Abisal",
+  "pokemob.move.hydro-vortex--special": "Hidrovórtice Abisal",
+  "pokemob.move.bloom-doom--physical": "Megatón Floral",
+  "pokemob.move.bloom-doom--special": "Megatón Floral",
+  "pokemob.move.gigavolt-havoc--physical": "Gigavoltio Destructor",
+  "pokemob.move.gigavolt-havoc--special": "Gigavoltio Destructor",
+  "pokemob.move.shattered-psyche--physical": "Disruptor Psíquico",
+  "pokemob.move.shattered-psyche--special": "Disruptor Psíquico",
+  "pokemob.move.subzero-slammer--physical": "Crioaliento Despiadado",
+  "pokemob.move.subzero-slammer--special": "Crioaliento Despiadado",
+  "pokemob.move.devastating-drake--physical": "Dracoaliento Devastador",
+  "pokemob.move.devastating-drake--special": "Dracoaliento Devastador",
+  "pokemob.move.black-hole-eclipse--physical": "Agujero Negro Aniquilador",
+  "pokemob.move.black-hole-eclipse--special": "Agujero Negro Aniquilador",
+  "pokemob.move.twinkle-tackle--physical": "Arrumaco Sideral",
+  "pokemob.move.twinkle-tackle--special": "Arrumaco Sideral",
+  "pokemob.move.catastropika": "Pikavoltio Letal",
+  "pokemob.move.shore-up": "Recogearena",
+  "pokemob.move.first-impression": "Escaramuza",
+  "pokemob.move.baneful-bunker": "Búnker",
+  "pokemob.move.spirit-shackle": "Puntada Sombría",
+  "pokemob.move.darkest-lariat": "Lariat Oscuro",
+  "pokemob.move.sparkling-aria": "Aria Burbuja",
+  "pokemob.move.ice-hammer": "Martillo Hielo",
+  "pokemob.move.floral-healing": "Cura Floral",
+  "pokemob.move.high-horsepower": "Fuerza Equina",
+  "pokemob.move.strength-sap": "Absorbefuerza",
+  "pokemob.move.solar-blade": "Cuchilla Solar",
+  "pokemob.move.leafage": "Follaje",
+  "pokemob.move.spotlight": "Foco",
+  "pokemob.move.toxic-thread": "Hilo Venenoso",
+  "pokemob.move.laser-focus": "Aguzar",
+  "pokemob.move.gear-up": "Piñón Auxiliar",
+  "pokemob.move.throat-chop": "Golpe Mordaza",
+  "pokemob.move.pollen-puff": "Bola de Polen",
+  "pokemob.move.anchor-shot": "Anclaje",
+  "pokemob.move.psychic-terrain": "Campo Psíquico",
+  "pokemob.move.lunge": "Plancha",
+  "pokemob.move.fire-lash": "Látigo Ígneo",
+  "pokemob.move.power-trip": "Chulería",
+  "pokemob.move.burn-up": "Llama Final",
+  "pokemob.move.speed-swap": "Cambiavelocidad",
+  "pokemob.move.smart-strike": "Cuerno Certero",
+  "pokemob.move.purify": "Purificación",
+  "pokemob.move.revelation-dance": "Danza Despertar",
+  "pokemob.move.core-enforcer": "Núcleo Castigo",
+  "pokemob.move.trop-kick": "Patada Tropical",
+  "pokemob.move.instruct": "Mandato",
+  "pokemob.move.beak-blast": "Pico Cañón",
+  "pokemob.move.clanging-scales": "Fragor Escamas",
+  "pokemob.move.dragon-hammer": "Martillo Dragón",
+  "pokemob.move.brutal-swing": "Giro Vil",
+  "pokemob.move.aurora-veil": "Velo Aurora",
+  "pokemob.move.sinister-arrow-raid": "Aluvión de Flechas Sombrías",
+  "pokemob.move.malicious-moonsault": "Hiperplancha Oscura",
+  "pokemob.move.oceanic-operetta": "Sinfonía de la Diva Marina",
+  "pokemob.move.guardian-of-alola": "Cólera del Guardián",
+  "pokemob.move.soul-stealing-7-star-strike": "Constelación Robaalmas",
+  "pokemob.move.stoked-sparksurfer": "Surfeo Galvánico",
+  "pokemob.move.pulverizing-pancake": "Arrojo Intempestivo",
+  "pokemob.move.extreme-evoboost": "Novena Potencia",
+  "pokemob.move.genesis-supernova": "Supernova Original",
+  "pokemob.move.shell-trap": "Coraza Trampa",
+  "pokemob.move.fleur-cannon": "Cañón Floral",
+  "pokemob.move.psychic-fangs": "Psicocolmillo",
+  "pokemob.move.stomping-tantrum": "Pataleta",
+  "pokemob.move.shadow-bone": "Hueso Sombrío",
+  "pokemob.move.accelerock": "Roca Veloz",
+  "pokemob.move.liquidation": "Hidroariete",
+  "pokemob.move.prismatic-laser": "Láser Prisma",
+  "pokemob.move.spectral-thief": "Robasombra",
+  "pokemob.move.sunsteel-strike": "Meteoimpacto",
+  "pokemob.move.moongeist-beam": "Rayo Umbrío",
+  "pokemob.move.tearful-look": "Ojos Llorosos",
+  "pokemob.move.zing-zap": "Electropunzada",
+  "pokemob.move.natures-madness": "Furia Natural",
+  "pokemob.move.multi-attack": "Multiataque",
+  "pokemob.move.10-000-000-volt-thunderbolt": "Gigarrayo Fulminante",
+  "pokemob.move.mind-blown": "Cabeza Sorpresa",
+  "pokemob.move.plasma-fists": "Puños Plasma",
+  "pokemob.move.photon-geyser": "Géiser Fotónico",
+  "pokemob.move.light-that-burns-the-sky": "Fotodestrucción Apocalíptica",
+  "pokemob.move.searing-sunraze-smash": "Embestida Solar",
+  "pokemob.move.menacing-moonraze-maelstrom": "Deflagración Lunar",
+  "pokemob.move.lets-snuggle-forever": "Somanta Amistosa",
+  "pokemob.move.splintered-stormshards": "Tempestad Rocosa",
+  "pokemob.move.clangorous-soulblaze": "Estruendo Implacable",
+  "pokemob.move.zippy-zap": "Pikaturbo",
+  "pokemob.move.splishy-splash": "Salpikasurf",
+  "pokemob.move.floaty-fall": "Pikapicado",
+  "pokemob.move.pika-papow": "Pikatormenta",
+  "pokemob.move.bouncy-bubble": "Vapodrenaje",
+  "pokemob.move.buzzy-buzz": "Joltioparálisis",
+  "pokemob.move.sizzly-slide": "Flarembestida",
+  "pokemob.move.glitzy-glow": "Espeaura",
+  "pokemob.move.baddy-bad": "Umbreozona",
+  "pokemob.move.sappy-seed": "Leafitobombas",
+  "pokemob.move.freezy-frost": "Glaceoprisma",
+  "pokemob.move.sparkly-swirl": "Sylveotornado",
+  "pokemob.move.veevee-volley": "Eevimpacto",
+  "pokemob.move.double-iron-bash": "Ferropuño Doble",
+  "pokemob.move.max-guard": "Maxibarrera",
+  "pokemob.move.dynamax-cannon": "Cañón Dinamax",
+  "pokemob.move.snipe-shot": "Disparo Certero",
+  "pokemob.move.jaw-lock": "Presa Maxilar",
+  "pokemob.move.stuff-cheeks": "Atiborramiento",
+  "pokemob.move.no-retreat": "Bastión Final",
+  "pokemob.move.tar-shot": "Alquitranazo",
+  "pokemob.move.magic-powder": "Polvo Mágico",
+  "pokemob.move.dragon-darts": "Dracoflechas",
+  "pokemob.move.teatime": "Hora del Té",
+  "pokemob.move.octolock": "Octopresa",
+  "pokemob.move.bolt-beak": "Electropico",
+  "pokemob.move.fishious-rend": "Branquibocado",
+  "pokemob.move.court-change": "Cambio de Cancha",
+  "pokemob.move.max-flare": "Maxignición",
+  "pokemob.move.max-flutterby": "Maxinsecto",
+  "pokemob.move.max-lightning": "Maxitormenta",
+  "pokemob.move.max-strike": "Maxiataque",
+  "pokemob.move.max-knuckle": "Maxipuño",
+  "pokemob.move.max-phantasm": "Maxiespectro",
+  "pokemob.move.max-hailstorm": "Maxihelada",
+  "pokemob.move.max-ooze": "Maxiácido",
+  "pokemob.move.max-geyser": "Maxichorro",
+  "pokemob.move.max-airstream": "Maxiciclón",
+  "pokemob.move.max-starfall": "Maxiestela",
+  "pokemob.move.max-wyrmwind": "Maxidraco",
+  "pokemob.move.max-mindstorm": "Maxionda",
+  "pokemob.move.max-rockfall": "Maxilito",
+  "pokemob.move.max-quake": "Maxitemblor",
+  "pokemob.move.max-darkness": "Maxisombra",
+  "pokemob.move.max-overgrowth": "Maxiflora",
+  "pokemob.move.max-steelspike": "Maximetal",
+  "pokemob.move.clangorous-soul": "Estruendo Escama",
+  "pokemob.move.body-press": "Plancha Corporal",
+  "pokemob.move.decorate": "Decoración",
+  "pokemob.move.drum-beating": "Batería Asalto",
+  "pokemob.move.snap-trap": "Cepo",
+  "pokemob.move.pyro-ball": "Balón Ígneo",
+  "pokemob.move.behemoth-blade": "Tajo Supremo",
+  "pokemob.move.behemoth-bash": "Embate Supremo",
+  "pokemob.move.aura-wheel": "Rueda Aural",
+  "pokemob.move.breaking-swipe": "Vasto Impacto",
+  "pokemob.move.branch-poke": "Punzada Rama",
+  "pokemob.move.overdrive": "Amplificador",
+  "pokemob.move.apple-acid": "Ácido Málico",
+  "pokemob.move.grav-apple": "Fuerza G",
+  "pokemob.move.spirit-break": "Choque Anímico",
+  "pokemob.move.strange-steam": "Cautivapor",
+  "pokemob.move.life-dew": "Gota Vital",
+  "pokemob.move.obstruct": "Obstrucción",
+  "pokemob.move.false-surrender": "Irreverencia",
+  "pokemob.move.meteor-assault": "Asalto Estelar",
+  "pokemob.move.eternabeam": "Rayo Infinito",
+  "pokemob.move.steel-beam": "Metaláser",
+  "pokemob.move.expanding-force": "Vasta Fuerza",
+  "pokemob.move.steel-roller": "Allanador Férreo",
+  "pokemob.move.scale-shot": "Ráfaga Escamas",
+  "pokemob.move.meteor-beam": "Rayo Meteórico",
+  "pokemob.move.shell-side-arm": "Moluscañón",
+  "pokemob.move.misty-explosion": "Bruma Explosiva",
+  "pokemob.move.grassy-glide": "Fitoimpulso",
+  "pokemob.move.rising-voltage": "Alto Voltaje",
+  "pokemob.move.terrain-pulse": "Pulso de Campo",
+  "pokemob.move.skitter-smack": "Golpe Rastrero",
+  "pokemob.move.burning-jealousy": "Envidia Ardiente",
+  "pokemob.move.lash-out": "Desahogo",
+  "pokemob.move.poltergeist": "Poltergeist",
+  "pokemob.move.corrosive-gas": "Gas Corrosivo",
+  "pokemob.move.coaching": "Motivación",
+  "pokemob.move.flip-turn": "Viraje",
+  "pokemob.move.triple-axel": "Triple Axel",
+  "pokemob.move.dual-wingbeat": "Ala Bis",
+  "pokemob.move.scorching-sands": "Arenas Ardientes",
+  "pokemob.move.jungle-healing": "Cura Selvática",
+  "pokemob.move.wicked-blow": "Golpe Oscuro",
+  "pokemob.move.surging-strikes": "Azote Torrencial",
+  "pokemob.move.thunder-cage": "Electrojaula",
+  "pokemob.move.dragon-energy": "Dracoenergía",
+  "pokemob.move.freezing-glare": "Mirada Heladora",
+  "pokemob.move.fiery-wrath": "Furia Candente",
+  "pokemob.move.thunderous-kick": "Patada Relámpago",
+  "pokemob.move.glacial-lance": "Lanza Glacial",
+  "pokemob.move.astral-barrage": "Orbes Espectro",
+  "pokemob.move.eerie-spell": "Conjuro Funesto",
+  "pokemob.move.shadow-rush": "Carga Oscura",
+  "pokemob.move.shadow-blast": "Soplo Oscuro",
+  "pokemob.move.shadow-blitz": "Vigor Oscuro",
+  "pokemob.move.shadow-bolt": "Rayo Oscuro",
+  "pokemob.move.shadow-break": "Brío Oscuro",
+  "pokemob.move.shadow-chill": "Hielo Oscuro",
+  "pokemob.move.shadow-end": "Fin Oscuro",
+  "pokemob.move.shadow-fire": "Fuego Oscuro",
+  "pokemob.move.shadow-rave": "Rabia Oscura",
+  "pokemob.move.shadow-storm": "Tifón Oscuro",
+  "pokemob.move.shadow-wave": "Onda Oscura",
+  "pokemob.move.shadow-down": "Ocaso Oscuro",
+  "pokemob.move.shadow-half": "Mitad Oscura",
+  "pokemob.move.shadow-hold": "Traba Oscura",
+  "pokemob.move.shadow-mist": "Bruma Oscura",
+  "pokemob.move.shadow-panic": "Miedo Oscuro",
+  "pokemob.move.shadow-shed": "Muda Oscura",
+  "pokemob.move.shadow-sky": "Cielo Oscuro"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/fr_fr.json b/src/main/resources/assets/pokecube_moves/lang/fr_fr.json
new file mode 100644
index 0000000000..c335c277b7
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/fr_fr.json
@@ -0,0 +1,846 @@
+{
+  "pokemob.move.pound": "Écras’Face",
+  "pokemob.move.karate-chop": "Poing Karaté",
+  "pokemob.move.double-slap": "Torgnoles",
+  "pokemob.move.comet-punch": "Poing Comète",
+  "pokemob.move.mega-punch": "Ultimapoing",
+  "pokemob.move.pay-day": "Jackpot",
+  "pokemob.move.fire-punch": "Poing Feu",
+  "pokemob.move.ice-punch": "Poing Glace",
+  "pokemob.move.thunder-punch": "Poing Éclair",
+  "pokemob.move.scratch": "Griffe",
+  "pokemob.move.vice-grip": "Force Poigne",
+  "pokemob.move.guillotine": "Guillotine",
+  "pokemob.move.razor-wind": "Coupe-Vent",
+  "pokemob.move.swords-dance": "Danse Lames",
+  "pokemob.move.cut": "Coupe",
+  "pokemob.move.gust": "Tornade",
+  "pokemob.move.wing-attack": "Cru-Ailes",
+  "pokemob.move.whirlwind": "Cyclone",
+  "pokemob.move.fly": "Vol",
+  "pokemob.move.bind": "Étreinte",
+  "pokemob.move.slam": "Souplesse",
+  "pokemob.move.vine-whip": "Fouet Lianes",
+  "pokemob.move.stomp": "Écrasement",
+  "pokemob.move.double-kick": "Double Pied",
+  "pokemob.move.mega-kick": "Ultimawashi",
+  "pokemob.move.jump-kick": "Pied Sauté",
+  "pokemob.move.rolling-kick": "Mawashi Geri",
+  "pokemob.move.sand-attack": "Jet de Sable",
+  "pokemob.move.headbutt": "Coup d’Boule",
+  "pokemob.move.horn-attack": "Koud’Korne",
+  "pokemob.move.fury-attack": "Furie",
+  "pokemob.move.horn-drill": "Empal’Korne",
+  "pokemob.move.tackle": "Charge",
+  "pokemob.move.body-slam": "Plaquage",
+  "pokemob.move.wrap": "Ligotage",
+  "pokemob.move.take-down": "Bélier",
+  "pokemob.move.thrash": "Mania",
+  "pokemob.move.double-edge": "Damoclès",
+  "pokemob.move.tail-whip": "Mimi-Queue",
+  "pokemob.move.poison-sting": "Dard-Venin",
+  "pokemob.move.twineedle": "Double Dard",
+  "pokemob.move.pin-missile": "Dard-Nuée",
+  "pokemob.move.leer": "Groz’Yeux",
+  "pokemob.move.bite": "Morsure",
+  "pokemob.move.growl": "Rugissement",
+  "pokemob.move.roar": "Hurlement",
+  "pokemob.move.sing": "Berceuse",
+  "pokemob.move.supersonic": "Ultrason",
+  "pokemob.move.sonic-boom": "Sonic Boom",
+  "pokemob.move.disable": "Entrave",
+  "pokemob.move.acid": "Acide",
+  "pokemob.move.ember": "Flammèche",
+  "pokemob.move.flamethrower": "Lance-Flammes",
+  "pokemob.move.mist": "Brume",
+  "pokemob.move.water-gun": "Pistolet à O",
+  "pokemob.move.hydro-pump": "Hydrocanon",
+  "pokemob.move.surf": "Surf",
+  "pokemob.move.ice-beam": "Laser Glace",
+  "pokemob.move.blizzard": "Blizzard",
+  "pokemob.move.psybeam": "Rafale Psy",
+  "pokemob.move.bubble-beam": "Bulles d’O",
+  "pokemob.move.aurora-beam": "Onde Boréale",
+  "pokemob.move.hyper-beam": "Ultralaser",
+  "pokemob.move.peck": "Picpic",
+  "pokemob.move.drill-peck": "Bec Vrille",
+  "pokemob.move.submission": "Sacrifice",
+  "pokemob.move.low-kick": "Balayage",
+  "pokemob.move.counter": "Riposte",
+  "pokemob.move.seismic-toss": "Frappe Atlas",
+  "pokemob.move.strength": "Force",
+  "pokemob.move.absorb": "Vole-Vie",
+  "pokemob.move.mega-drain": "Méga-Sangsue",
+  "pokemob.move.leech-seed": "Vampigraine",
+  "pokemob.move.growth": "Croissance",
+  "pokemob.move.razor-leaf": "Tranch’Herbe",
+  "pokemob.move.solar-beam": "Lance-Soleil",
+  "pokemob.move.poison-powder": "Poudre Toxik",
+  "pokemob.move.stun-spore": "Para-Spore",
+  "pokemob.move.sleep-powder": "Poudre Dodo",
+  "pokemob.move.petal-dance": "Danse Fleurs",
+  "pokemob.move.string-shot": "Sécrétion",
+  "pokemob.move.dragon-rage": "Draco-Rage",
+  "pokemob.move.fire-spin": "Danse Flammes",
+  "pokemob.move.thunder-shock": "Éclair",
+  "pokemob.move.thunderbolt": "Tonnerre",
+  "pokemob.move.thunder-wave": "Cage Éclair",
+  "pokemob.move.thunder": "Fatal-Foudre",
+  "pokemob.move.rock-throw": "Jet-Pierres",
+  "pokemob.move.earthquake": "Séisme",
+  "pokemob.move.fissure": "Abîme",
+  "pokemob.move.dig": "Tunnel",
+  "pokemob.move.toxic": "Toxik",
+  "pokemob.move.confusion": "Choc Mental",
+  "pokemob.move.psychic": "Psyko",
+  "pokemob.move.hypnosis": "Hypnose",
+  "pokemob.move.meditate": "Yoga",
+  "pokemob.move.agility": "Hâte",
+  "pokemob.move.quick-attack": "Vive-Attaque",
+  "pokemob.move.rage": "Frénésie",
+  "pokemob.move.teleport": "Téléport",
+  "pokemob.move.night-shade": "Ombre Nocturne",
+  "pokemob.move.mimic": "Copie",
+  "pokemob.move.screech": "Grincement",
+  "pokemob.move.double-team": "Reflet",
+  "pokemob.move.recover": "Soin",
+  "pokemob.move.harden": "Armure",
+  "pokemob.move.minimize": "Lilliput",
+  "pokemob.move.smokescreen": "Brouillard",
+  "pokemob.move.confuse-ray": "Onde Folie",
+  "pokemob.move.withdraw": "Repli",
+  "pokemob.move.defense-curl": "Boul’Armure",
+  "pokemob.move.barrier": "Bouclier",
+  "pokemob.move.light-screen": "Mur Lumière",
+  "pokemob.move.haze": "Buée Noire",
+  "pokemob.move.reflect": "Protection",
+  "pokemob.move.focus-energy": "Puissance",
+  "pokemob.move.bide": "Patience",
+  "pokemob.move.metronome": "Métronome",
+  "pokemob.move.mirror-move": "Mimique",
+  "pokemob.move.self-destruct": "Destruction",
+  "pokemob.move.egg-bomb": "Bombe Œuf",
+  "pokemob.move.lick": "Léchouille",
+  "pokemob.move.smog": "Purédpois",
+  "pokemob.move.sludge": "Détritus",
+  "pokemob.move.bone-club": "Massd’Os",
+  "pokemob.move.fire-blast": "Déflagration",
+  "pokemob.move.waterfall": "Cascade",
+  "pokemob.move.clamp": "Claquoir",
+  "pokemob.move.swift": "Météores",
+  "pokemob.move.skull-bash": "Coud’Krâne",
+  "pokemob.move.spike-cannon": "Picanon",
+  "pokemob.move.constrict": "Constriction",
+  "pokemob.move.amnesia": "Amnésie",
+  "pokemob.move.kinesis": "Télékinésie",
+  "pokemob.move.soft-boiled": "E-Coque",
+  "pokemob.move.high-jump-kick": "Pied Voltige",
+  "pokemob.move.glare": "Regard Médusant",
+  "pokemob.move.dream-eater": "Dévorêve",
+  "pokemob.move.poison-gas": "Gaz Toxik",
+  "pokemob.move.barrage": "Pilonnage",
+  "pokemob.move.leech-life": "Vampirisme",
+  "pokemob.move.lovely-kiss": "Grobisou",
+  "pokemob.move.sky-attack": "Piqué",
+  "pokemob.move.transform": "Morphing",
+  "pokemob.move.bubble": "Écume",
+  "pokemob.move.dizzy-punch": "Uppercut",
+  "pokemob.move.spore": "Spore",
+  "pokemob.move.flash": "Flash",
+  "pokemob.move.psywave": "Vague Psy",
+  "pokemob.move.splash": "Trempette",
+  "pokemob.move.acid-armor": "Acidarmure",
+  "pokemob.move.crabhammer": "Pince-Masse",
+  "pokemob.move.explosion": "Explosion",
+  "pokemob.move.fury-swipes": "Combo-Griffe",
+  "pokemob.move.bonemerang": "Osmerang",
+  "pokemob.move.rest": "Repos",
+  "pokemob.move.rock-slide": "Éboulement",
+  "pokemob.move.hyper-fang": "Croc de Mort",
+  "pokemob.move.sharpen": "Affûtage",
+  "pokemob.move.conversion": "Conversion",
+  "pokemob.move.tri-attack": "Triplattaque",
+  "pokemob.move.super-fang": "Croc Fatal",
+  "pokemob.move.slash": "Tranche",
+  "pokemob.move.substitute": "Clonage",
+  "pokemob.move.struggle": "Lutte",
+  "pokemob.move.sketch": "Gribouille",
+  "pokemob.move.triple-kick": "Triple Pied",
+  "pokemob.move.thief": "Larcin",
+  "pokemob.move.spider-web": "Toile",
+  "pokemob.move.mind-reader": "Lire-Esprit",
+  "pokemob.move.nightmare": "Cauchemar",
+  "pokemob.move.flame-wheel": "Roue de Feu",
+  "pokemob.move.snore": "Ronflement",
+  "pokemob.move.curse": "Malédiction",
+  "pokemob.move.flail": "Gigotage",
+  "pokemob.move.conversion-2": "Conversion 2",
+  "pokemob.move.aeroblast": "Aéroblast",
+  "pokemob.move.cotton-spore": "Spore Coton",
+  "pokemob.move.reversal": "Contre",
+  "pokemob.move.spite": "Dépit",
+  "pokemob.move.powder-snow": "Poudreuse",
+  "pokemob.move.protect": "Abri",
+  "pokemob.move.mach-punch": "Mach Punch",
+  "pokemob.move.scary-face": "Grimace",
+  "pokemob.move.feint-attack": "Feinte",
+  "pokemob.move.sweet-kiss": "Doux Baiser",
+  "pokemob.move.belly-drum": "Cognobidon",
+  "pokemob.move.sludge-bomb": "Bombe Beurk",
+  "pokemob.move.mud-slap": "Coud’Boue",
+  "pokemob.move.octazooka": "Octazooka",
+  "pokemob.move.spikes": "Picots",
+  "pokemob.move.zap-cannon": "Élecanon",
+  "pokemob.move.foresight": "Clairvoyance",
+  "pokemob.move.destiny-bond": "Lien du Destin",
+  "pokemob.move.perish-song": "Requiem",
+  "pokemob.move.icy-wind": "Vent Glace",
+  "pokemob.move.detect": "Détection",
+  "pokemob.move.bone-rush": "Charge Os",
+  "pokemob.move.lock-on": "Verrouillage",
+  "pokemob.move.outrage": "Colère",
+  "pokemob.move.sandstorm": "Tempête de Sable",
+  "pokemob.move.giga-drain": "Giga-Sangsue",
+  "pokemob.move.endure": "Ténacité",
+  "pokemob.move.charm": "Charme",
+  "pokemob.move.rollout": "Roulade",
+  "pokemob.move.false-swipe": "Faux-Chage",
+  "pokemob.move.swagger": "Vantardise",
+  "pokemob.move.milk-drink": "Lait à Boire",
+  "pokemob.move.spark": "Étincelle",
+  "pokemob.move.fury-cutter": "Taillade",
+  "pokemob.move.steel-wing": "Ailes d’Acier",
+  "pokemob.move.mean-look": "Regard Noir",
+  "pokemob.move.attract": "Attraction",
+  "pokemob.move.sleep-talk": "Blabla Dodo",
+  "pokemob.move.heal-bell": "Glas de Soin",
+  "pokemob.move.return": "Retour",
+  "pokemob.move.present": "Cadeau",
+  "pokemob.move.frustration": "Frustration",
+  "pokemob.move.safeguard": "Rune Protect",
+  "pokemob.move.pain-split": "Balance",
+  "pokemob.move.sacred-fire": "Feu Sacré",
+  "pokemob.move.magnitude": "Ampleur",
+  "pokemob.move.dynamic-punch": "Dynamo-Poing",
+  "pokemob.move.megahorn": "Mégacorne",
+  "pokemob.move.dragon-breath": "Draco-Souffle",
+  "pokemob.move.baton-pass": "Relais",
+  "pokemob.move.encore": "Encore",
+  "pokemob.move.pursuit": "Poursuite",
+  "pokemob.move.rapid-spin": "Tour Rapide",
+  "pokemob.move.sweet-scent": "Doux Parfum",
+  "pokemob.move.iron-tail": "Queue de Fer",
+  "pokemob.move.metal-claw": "Griffe Acier",
+  "pokemob.move.vital-throw": "Corps Perdu",
+  "pokemob.move.morning-sun": "Aurore",
+  "pokemob.move.synthesis": "Synthèse",
+  "pokemob.move.moonlight": "Rayon Lune",
+  "pokemob.move.hidden-power": "Puissance Cachée",
+  "pokemob.move.cross-chop": "Coup Croix",
+  "pokemob.move.twister": "Ouragan",
+  "pokemob.move.rain-dance": "Danse Pluie",
+  "pokemob.move.sunny-day": "Zénith",
+  "pokemob.move.crunch": "Mâchouille",
+  "pokemob.move.mirror-coat": "Voile Miroir",
+  "pokemob.move.psych-up": "Boost",
+  "pokemob.move.extreme-speed": "Vitesse Extrême",
+  "pokemob.move.ancient-power": "Pouvoir Antique",
+  "pokemob.move.shadow-ball": "Ball’Ombre",
+  "pokemob.move.future-sight": "Prescience",
+  "pokemob.move.rock-smash": "Éclate-Roc",
+  "pokemob.move.whirlpool": "Siphon",
+  "pokemob.move.beat-up": "Baston",
+  "pokemob.move.fake-out": "Bluff",
+  "pokemob.move.uproar": "Brouhaha",
+  "pokemob.move.stockpile": "Stockage",
+  "pokemob.move.spit-up": "Relâche",
+  "pokemob.move.swallow": "Avale",
+  "pokemob.move.heat-wave": "Canicule",
+  "pokemob.move.hail": "Grêle",
+  "pokemob.move.torment": "Tourmente",
+  "pokemob.move.flatter": "Flatterie",
+  "pokemob.move.will-o-wisp": "Feu Follet",
+  "pokemob.move.memento": "Souvenir",
+  "pokemob.move.facade": "Façade",
+  "pokemob.move.focus-punch": "Mitra-Poing",
+  "pokemob.move.smelling-salts": "Stimulant",
+  "pokemob.move.follow-me": "Par Ici",
+  "pokemob.move.nature-power": "Force Nature",
+  "pokemob.move.charge": "Chargeur",
+  "pokemob.move.taunt": "Provoc",
+  "pokemob.move.helping-hand": "Coup d’Main",
+  "pokemob.move.trick": "Tour de Magie",
+  "pokemob.move.role-play": "Imitation",
+  "pokemob.move.wish": "Vœu",
+  "pokemob.move.assist": "Assistance",
+  "pokemob.move.ingrain": "Racines",
+  "pokemob.move.superpower": "Surpuissance",
+  "pokemob.move.magic-coat": "Reflet Magik",
+  "pokemob.move.recycle": "Recyclage",
+  "pokemob.move.revenge": "Vendetta",
+  "pokemob.move.brick-break": "Casse-Brique",
+  "pokemob.move.yawn": "Bâillement",
+  "pokemob.move.knock-off": "Sabotage",
+  "pokemob.move.endeavor": "Effort",
+  "pokemob.move.eruption": "Éruption",
+  "pokemob.move.skill-swap": "Échange",
+  "pokemob.move.imprison": "Possessif",
+  "pokemob.move.refresh": "Régénération",
+  "pokemob.move.grudge": "Rancune",
+  "pokemob.move.snatch": "Saisie",
+  "pokemob.move.secret-power": "Force Cachée",
+  "pokemob.move.dive": "Plongée",
+  "pokemob.move.arm-thrust": "Cogne",
+  "pokemob.move.camouflage": "Camouflage",
+  "pokemob.move.tail-glow": "Lumi-Queue",
+  "pokemob.move.luster-purge": "Lumi-Éclat",
+  "pokemob.move.mist-ball": "Ball’Brume",
+  "pokemob.move.feather-dance": "Danse Plumes",
+  "pokemob.move.teeter-dance": "Danse Folle",
+  "pokemob.move.blaze-kick": "Pied Brûleur",
+  "pokemob.move.mud-sport": "Lance-Boue",
+  "pokemob.move.ice-ball": "Ball’Glace",
+  "pokemob.move.needle-arm": "Poing Dard",
+  "pokemob.move.slack-off": "Paresse",
+  "pokemob.move.hyper-voice": "Mégaphone",
+  "pokemob.move.poison-fang": "Crochet Venin",
+  "pokemob.move.crush-claw": "Éclate Griffe",
+  "pokemob.move.blast-burn": "Rafale Feu",
+  "pokemob.move.hydro-cannon": "Hydroblast",
+  "pokemob.move.meteor-mash": "Poing Météore",
+  "pokemob.move.astonish": "Étonnement",
+  "pokemob.move.weather-ball": "Ball’Météo",
+  "pokemob.move.aromatherapy": "Aromathérapie",
+  "pokemob.move.fake-tears": "Croco Larme",
+  "pokemob.move.air-cutter": "Tranch’Air",
+  "pokemob.move.overheat": "Surchauffe",
+  "pokemob.move.odor-sleuth": "Flair",
+  "pokemob.move.rock-tomb": "Tomberoche",
+  "pokemob.move.silver-wind": "Vent Argenté",
+  "pokemob.move.metal-sound": "Strido-Son",
+  "pokemob.move.grass-whistle": "Siffl’Herbe",
+  "pokemob.move.tickle": "Chatouille",
+  "pokemob.move.cosmic-power": "Force Cosmique",
+  "pokemob.move.water-spout": "Giclédo",
+  "pokemob.move.signal-beam": "Rayon Signal",
+  "pokemob.move.shadow-punch": "Poing Ombre",
+  "pokemob.move.extrasensory": "Extrasenseur",
+  "pokemob.move.sky-uppercut": "Stratopercut",
+  "pokemob.move.sand-tomb": "Tourbi-Sable",
+  "pokemob.move.sheer-cold": "Glaciation",
+  "pokemob.move.muddy-water": "Ocroupi",
+  "pokemob.move.bullet-seed": "Balle Graine",
+  "pokemob.move.aerial-ace": "Aéropique",
+  "pokemob.move.icicle-spear": "Stalactite",
+  "pokemob.move.iron-defense": "Mur de Fer",
+  "pokemob.move.block": "Barrage",
+  "pokemob.move.howl": "Grondement",
+  "pokemob.move.dragon-claw": "Draco-Griffe",
+  "pokemob.move.frenzy-plant": "Végé-Attaque",
+  "pokemob.move.bulk-up": "Gonflette",
+  "pokemob.move.bounce": "Rebond",
+  "pokemob.move.mud-shot": "Tir de Boue",
+  "pokemob.move.poison-tail": "Queue-Poison",
+  "pokemob.move.covet": "Implore",
+  "pokemob.move.volt-tackle": "Électacle",
+  "pokemob.move.magical-leaf": "Feuille Magik",
+  "pokemob.move.water-sport": "Tourniquet",
+  "pokemob.move.calm-mind": "Plénitude",
+  "pokemob.move.leaf-blade": "Lame Feuille",
+  "pokemob.move.dragon-dance": "Danse Draco",
+  "pokemob.move.rock-blast": "Boule Roc",
+  "pokemob.move.shock-wave": "Onde de Choc",
+  "pokemob.move.water-pulse": "Vibraqua",
+  "pokemob.move.doom-desire": "Vœu Destructeur",
+  "pokemob.move.psycho-boost": "Psycho-Boost",
+  "pokemob.move.roost": "Atterrissage",
+  "pokemob.move.gravity": "Gravité",
+  "pokemob.move.miracle-eye": "Œil Miracle",
+  "pokemob.move.wake-up-slap": "Réveil Forcé",
+  "pokemob.move.hammer-arm": "Marto-Poing",
+  "pokemob.move.gyro-ball": "Gyroballe",
+  "pokemob.move.healing-wish": "Vœu Soin",
+  "pokemob.move.brine": "Saumure",
+  "pokemob.move.natural-gift": "Don Naturel",
+  "pokemob.move.feint": "Ruse",
+  "pokemob.move.pluck": "Picore",
+  "pokemob.move.tailwind": "Vent Arrière",
+  "pokemob.move.acupressure": "Acupression",
+  "pokemob.move.metal-burst": "Fulmifer",
+  "pokemob.move.u-turn": "Demi-Tour",
+  "pokemob.move.close-combat": "Close Combat",
+  "pokemob.move.payback": "Représailles",
+  "pokemob.move.assurance": "Assurance",
+  "pokemob.move.embargo": "Embargo",
+  "pokemob.move.fling": "Dégommage",
+  "pokemob.move.psycho-shift": "Échange Psy",
+  "pokemob.move.trump-card": "Atout",
+  "pokemob.move.heal-block": "Anti-Soin",
+  "pokemob.move.wring-out": "Essorage",
+  "pokemob.move.power-trick": "Astuce Force",
+  "pokemob.move.gastro-acid": "Suc Digestif",
+  "pokemob.move.lucky-chant": "Air Veinard",
+  "pokemob.move.me-first": "Moi d’Abord",
+  "pokemob.move.copycat": "Photocopie",
+  "pokemob.move.power-swap": "Permuforce",
+  "pokemob.move.guard-swap": "Permugarde",
+  "pokemob.move.punishment": "Punition",
+  "pokemob.move.last-resort": "Dernier Recours",
+  "pokemob.move.worry-seed": "Soucigraine",
+  "pokemob.move.sucker-punch": "Coup Bas",
+  "pokemob.move.toxic-spikes": "Pics Toxik",
+  "pokemob.move.heart-swap": "Permucœur",
+  "pokemob.move.aqua-ring": "Anneau Hydro",
+  "pokemob.move.magnet-rise": "Vol Magnétik",
+  "pokemob.move.flare-blitz": "Boutefeu",
+  "pokemob.move.force-palm": "Forte-Paume",
+  "pokemob.move.aura-sphere": "Aurasphère",
+  "pokemob.move.rock-polish": "Poliroche",
+  "pokemob.move.poison-jab": "Direct Toxik",
+  "pokemob.move.dark-pulse": "Vibrobscur",
+  "pokemob.move.night-slash": "Tranche-Nuit",
+  "pokemob.move.aqua-tail": "Hydro-Queue",
+  "pokemob.move.seed-bomb": "Canon Graine",
+  "pokemob.move.air-slash": "Lame d’Air",
+  "pokemob.move.x-scissor": "Plaie Croix",
+  "pokemob.move.bug-buzz": "Bourdon",
+  "pokemob.move.dragon-pulse": "Draco-Choc",
+  "pokemob.move.dragon-rush": "Draco-Charge",
+  "pokemob.move.power-gem": "Rayon Gemme",
+  "pokemob.move.drain-punch": "Vampi-Poing",
+  "pokemob.move.vacuum-wave": "Onde Vide",
+  "pokemob.move.focus-blast": "Exploforce",
+  "pokemob.move.energy-ball": "Éco-Sphère",
+  "pokemob.move.brave-bird": "Rapace",
+  "pokemob.move.earth-power": "Telluriforce",
+  "pokemob.move.switcheroo": "Passe-Passe",
+  "pokemob.move.giga-impact": "Giga Impact",
+  "pokemob.move.nasty-plot": "Machination",
+  "pokemob.move.bullet-punch": "Pisto-Poing",
+  "pokemob.move.avalanche": "Avalanche",
+  "pokemob.move.ice-shard": "Éclats Glace",
+  "pokemob.move.shadow-claw": "Griffe Ombre",
+  "pokemob.move.thunder-fang": "Crocs Éclair",
+  "pokemob.move.ice-fang": "Crocs Givre",
+  "pokemob.move.fire-fang": "Crocs Feu",
+  "pokemob.move.shadow-sneak": "Ombre Portée",
+  "pokemob.move.mud-bomb": "Boue-Bombe",
+  "pokemob.move.psycho-cut": "Coupe Psycho",
+  "pokemob.move.zen-headbutt": "Psykoud’Boul",
+  "pokemob.move.mirror-shot": "Miroi-Tir",
+  "pokemob.move.flash-cannon": "Luminocanon",
+  "pokemob.move.rock-climb": "Escalade",
+  "pokemob.move.defog": "Anti-Brume",
+  "pokemob.move.trick-room": "Distorsion",
+  "pokemob.move.draco-meteor": "Draco-Météore",
+  "pokemob.move.discharge": "Coup d’Jus",
+  "pokemob.move.lava-plume": "Ébullilave",
+  "pokemob.move.leaf-storm": "Tempête Verte",
+  "pokemob.move.power-whip": "Mégafouet",
+  "pokemob.move.rock-wrecker": "Roc-Boulet",
+  "pokemob.move.cross-poison": "Poison Croix",
+  "pokemob.move.gunk-shot": "Détricanon",
+  "pokemob.move.iron-head": "Tête de Fer",
+  "pokemob.move.magnet-bomb": "Bombe Aimant",
+  "pokemob.move.stone-edge": "Lame de Roc",
+  "pokemob.move.captivate": "Séduction",
+  "pokemob.move.stealth-rock": "Piège de Roc",
+  "pokemob.move.grass-knot": "Nœud Herbe",
+  "pokemob.move.chatter": "Babil",
+  "pokemob.move.judgment": "Jugement",
+  "pokemob.move.bug-bite": "Piqûre",
+  "pokemob.move.charge-beam": "Rayon Chargé",
+  "pokemob.move.wood-hammer": "Martobois",
+  "pokemob.move.aqua-jet": "Aqua-Jet",
+  "pokemob.move.attack-order": "Appel Attaque",
+  "pokemob.move.defend-order": "Appel Défense",
+  "pokemob.move.heal-order": "Appel Soins",
+  "pokemob.move.head-smash": "Fracass’Tête",
+  "pokemob.move.double-hit": "Coup Double",
+  "pokemob.move.roar-of-time": "Hurle-Temps",
+  "pokemob.move.spacial-rend": "Spatio-Rift",
+  "pokemob.move.lunar-dance": "Danse Lune",
+  "pokemob.move.crush-grip": "Presse",
+  "pokemob.move.magma-storm": "Vortex Magma",
+  "pokemob.move.dark-void": "Trou Noir",
+  "pokemob.move.seed-flare": "Fulmigraine",
+  "pokemob.move.ominous-wind": "Vent Mauvais",
+  "pokemob.move.shadow-force": "Revenant",
+  "pokemob.move.hone-claws": "Aiguisage",
+  "pokemob.move.wide-guard": "Garde Large",
+  "pokemob.move.guard-split": "Partage Garde",
+  "pokemob.move.power-split": "Partage Force",
+  "pokemob.move.wonder-room": "Zone Étrange",
+  "pokemob.move.psyshock": "Choc Psy",
+  "pokemob.move.venoshock": "Choc Venin",
+  "pokemob.move.autotomize": "Allègement",
+  "pokemob.move.rage-powder": "Poudre Fureur",
+  "pokemob.move.telekinesis": "Lévikinésie",
+  "pokemob.move.magic-room": "Zone Magique",
+  "pokemob.move.smack-down": "Anti-Air",
+  "pokemob.move.storm-throw": "Yama Arashi",
+  "pokemob.move.flame-burst": "Rebondifeu",
+  "pokemob.move.sludge-wave": "Cradovague",
+  "pokemob.move.quiver-dance": "Papillodanse",
+  "pokemob.move.heavy-slam": "Tacle Lourd",
+  "pokemob.move.synchronoise": "Synchropeine",
+  "pokemob.move.electro-ball": "Boule Élek",
+  "pokemob.move.soak": "Détrempage",
+  "pokemob.move.flame-charge": "Nitrocharge",
+  "pokemob.move.coil": "Enroulement",
+  "pokemob.move.low-sweep": "Balayette",
+  "pokemob.move.acid-spray": "Bombe Acide",
+  "pokemob.move.foul-play": "Tricherie",
+  "pokemob.move.simple-beam": "Rayon Simple",
+  "pokemob.move.entrainment": "Ten-Danse",
+  "pokemob.move.after-you": "Après Vous",
+  "pokemob.move.round": "Chant Canon",
+  "pokemob.move.echoed-voice": "Écho",
+  "pokemob.move.chip-away": "Attrition",
+  "pokemob.move.clear-smog": "Bain de Smog",
+  "pokemob.move.stored-power": "Force Ajoutée",
+  "pokemob.move.quick-guard": "Prévention",
+  "pokemob.move.ally-switch": "Interversion",
+  "pokemob.move.scald": "Ébullition",
+  "pokemob.move.shell-smash": "Exuviation",
+  "pokemob.move.heal-pulse": "Vibra Soin",
+  "pokemob.move.hex": "Châtiment",
+  "pokemob.move.sky-drop": "Chute Libre",
+  "pokemob.move.shift-gear": "Chgt Vitesse",
+  "pokemob.move.circle-throw": "Projection",
+  "pokemob.move.incinerate": "Calcination",
+  "pokemob.move.quash": "À la Queue",
+  "pokemob.move.acrobatics": "Acrobatie",
+  "pokemob.move.reflect-type": "Copie-Type",
+  "pokemob.move.retaliate": "Vengeance",
+  "pokemob.move.final-gambit": "Tout ou Rien",
+  "pokemob.move.bestow": "Passe-Cadeau",
+  "pokemob.move.inferno": "Feu d’Enfer",
+  "pokemob.move.water-pledge": "Aire d’Eau",
+  "pokemob.move.fire-pledge": "Aire de Feu",
+  "pokemob.move.grass-pledge": "Aire d’Herbe",
+  "pokemob.move.volt-switch": "Change Éclair",
+  "pokemob.move.struggle-bug": "Survinsecte",
+  "pokemob.move.bulldoze": "Piétisol",
+  "pokemob.move.frost-breath": "Souffle Glacé",
+  "pokemob.move.dragon-tail": "Draco-Queue",
+  "pokemob.move.work-up": "Rengorgement",
+  "pokemob.move.electroweb": "Toile Élek",
+  "pokemob.move.wild-charge": "Éclair Fou",
+  "pokemob.move.drill-run": "Tunnelier",
+  "pokemob.move.dual-chop": "Double Baffe",
+  "pokemob.move.heart-stamp": "Crève-Cœur",
+  "pokemob.move.horn-leech": "Encornebois",
+  "pokemob.move.sacred-sword": "Lame Sainte",
+  "pokemob.move.razor-shell": "Coqui-Lame",
+  "pokemob.move.heat-crash": "Tacle Feu",
+  "pokemob.move.leaf-tornado": "Phytomixeur",
+  "pokemob.move.steamroller": "Bulldoboule",
+  "pokemob.move.cotton-guard": "Cotogarde",
+  "pokemob.move.night-daze": "Explonuit",
+  "pokemob.move.psystrike": "Frappe Psy",
+  "pokemob.move.tail-slap": "Plumo-Queue",
+  "pokemob.move.hurricane": "Vent Violent",
+  "pokemob.move.head-charge": "Peignée",
+  "pokemob.move.gear-grind": "Lancécrou",
+  "pokemob.move.searing-shot": "Incendie",
+  "pokemob.move.techno-blast": "Techno-Buster",
+  "pokemob.move.relic-song": "Chant Antique",
+  "pokemob.move.secret-sword": "Lame Ointe",
+  "pokemob.move.glaciate": "Ère Glaciaire",
+  "pokemob.move.bolt-strike": "Charge Foudre",
+  "pokemob.move.blue-flare": "Flamme Bleue",
+  "pokemob.move.fiery-dance": "Danse du Feu",
+  "pokemob.move.freeze-shock": "Éclair Gelé",
+  "pokemob.move.ice-burn": "Feu Glacé",
+  "pokemob.move.snarl": "Aboiement",
+  "pokemob.move.icicle-crash": "Chute Glace",
+  "pokemob.move.v-create": "Coup Victoire",
+  "pokemob.move.fusion-flare": "Flamme Croix",
+  "pokemob.move.fusion-bolt": "Éclair Croix",
+  "pokemob.move.flying-press": "Flying Press",
+  "pokemob.move.mat-block": "Tatamigaeshi",
+  "pokemob.move.belch": "Éructation",
+  "pokemob.move.rototiller": "Fertilisation",
+  "pokemob.move.sticky-web": "Toile Gluante",
+  "pokemob.move.fell-stinger": "Dard Mortel",
+  "pokemob.move.phantom-force": "Hantise",
+  "pokemob.move.trick-or-treat": "Halloween",
+  "pokemob.move.noble-roar": "Râle Mâle",
+  "pokemob.move.ion-deluge": "Déluge Plasmique",
+  "pokemob.move.parabolic-charge": "Parabocharge",
+  "pokemob.move.forests-curse": "Maléfice Sylvain",
+  "pokemob.move.petal-blizzard": "Tempête Florale",
+  "pokemob.move.freeze-dry": "Lyophilisation",
+  "pokemob.move.disarming-voice": "Voix Enjôleuse",
+  "pokemob.move.parting-shot": "Dernier Mot",
+  "pokemob.move.topsy-turvy": "Renversement",
+  "pokemob.move.draining-kiss": "Vampibaiser",
+  "pokemob.move.crafty-shield": "Vigilance",
+  "pokemob.move.flower-shield": "Garde Florale",
+  "pokemob.move.grassy-terrain": "Champ Herbu",
+  "pokemob.move.misty-terrain": "Champ Brumeux",
+  "pokemob.move.electrify": "Électrisation",
+  "pokemob.move.play-rough": "Câlinerie",
+  "pokemob.move.fairy-wind": "Vent Féérique",
+  "pokemob.move.moonblast": "Pouvoir Lunaire",
+  "pokemob.move.boomburst": "Bang Sonique",
+  "pokemob.move.fairy-lock": "Verrou Enchanté",
+  "pokemob.move.kings-shield": "Bouclier Royal",
+  "pokemob.move.play-nice": "Camaraderie",
+  "pokemob.move.confide": "Confidence",
+  "pokemob.move.diamond-storm": "Orage Adamantin",
+  "pokemob.move.steam-eruption": "Jet de Vapeur",
+  "pokemob.move.hyperspace-hole": "TrouDimensionnel",
+  "pokemob.move.water-shuriken": "Sheauriken",
+  "pokemob.move.mystical-fire": "Feu Ensorcelé",
+  "pokemob.move.spiky-shield": "Pico-Défense",
+  "pokemob.move.aromatic-mist": "Brume Capiteuse",
+  "pokemob.move.eerie-impulse": "Ondes Étranges",
+  "pokemob.move.venom-drench": "Piège de Venin",
+  "pokemob.move.powder": "Nuée de Poudre",
+  "pokemob.move.geomancy": "Géo-Contrôle",
+  "pokemob.move.magnetic-flux": "Magné-Contrôle",
+  "pokemob.move.happy-hour": "Étrennes",
+  "pokemob.move.electric-terrain": "Champ Électrifié",
+  "pokemob.move.dazzling-gleam": "Éclat Magique",
+  "pokemob.move.celebrate": "Célébration",
+  "pokemob.move.hold-hands": "Mains Jointes",
+  "pokemob.move.baby-doll-eyes": "Regard Touchant",
+  "pokemob.move.nuzzle": "Frotte-Frimousse",
+  "pokemob.move.hold-back": "Retenue",
+  "pokemob.move.infestation": "Harcèlement",
+  "pokemob.move.power-up-punch": "Poing Boost",
+  "pokemob.move.oblivion-wing": "Mort’Ailes",
+  "pokemob.move.thousand-arrows": "Myria-Flèches",
+  "pokemob.move.thousand-waves": "Myria-Vagues",
+  "pokemob.move.lands-wrath": "Force Chtonienne",
+  "pokemob.move.light-of-ruin": "Lumière du Néant",
+  "pokemob.move.origin-pulse": "Onde Originelle",
+  "pokemob.move.precipice-blades": "Lame Pangéenne",
+  "pokemob.move.dragon-ascent": "Draco-Ascension",
+  "pokemob.move.hyperspace-fury": "Furie Dimension",
+  "pokemob.move.breakneck-blitz--physical": "Turbo-Charge Bulldozer",
+  "pokemob.move.breakneck-blitz--special": "Turbo-Charge Bulldozer",
+  "pokemob.move.all-out-pummeling--physical": "Combo Hyper-Furie",
+  "pokemob.move.all-out-pummeling--special": "Combo Hyper-Furie",
+  "pokemob.move.supersonic-skystrike--physical": "Piqué Supersonique",
+  "pokemob.move.supersonic-skystrike--special": "Piqué Supersonique",
+  "pokemob.move.acid-downpour--physical": "Déluge Causti-Toxique",
+  "pokemob.move.acid-downpour--special": "Déluge Causti-Toxique",
+  "pokemob.move.tectonic-rage--physical": "Éruption Géo-Sismique",
+  "pokemob.move.tectonic-rage--special": "Éruption Géo-Sismique",
+  "pokemob.move.continental-crush--physical": "Apocalypse Gigalithique",
+  "pokemob.move.continental-crush--special": "Apocalypse Gigalithique",
+  "pokemob.move.savage-spin-out--physical": "Cocon Fatal",
+  "pokemob.move.savage-spin-out--special": "Cocon Fatal",
+  "pokemob.move.never-ending-nightmare--physical": "Appel des Ombres Éternelles",
+  "pokemob.move.never-ending-nightmare--special": "Appel des Ombres Éternelles",
+  "pokemob.move.corkscrew-crash--physical": "Vrille Maximum",
+  "pokemob.move.corkscrew-crash--special": "Vrille Maximum",
+  "pokemob.move.inferno-overdrive--physical": "Pyro-Explosion Cataclysmique",
+  "pokemob.move.inferno-overdrive--special": "Pyro-Explosion Cataclysmique",
+  "pokemob.move.hydro-vortex--physical": "Super Tourbillon Abyssal",
+  "pokemob.move.hydro-vortex--special": "Super Tourbillon Abyssal",
+  "pokemob.move.bloom-doom--physical": "Pétalexplosion Éblouissante",
+  "pokemob.move.bloom-doom--special": "Pétalexplosion Éblouissante",
+  "pokemob.move.gigavolt-havoc--physical": "Fulguro-Lance Gigavolt",
+  "pokemob.move.gigavolt-havoc--special": "Fulguro-Lance Gigavolt",
+  "pokemob.move.shattered-psyche--physical": "Psycho-Pulvérisation EX",
+  "pokemob.move.shattered-psyche--special": "Psycho-Pulvérisation EX",
+  "pokemob.move.subzero-slammer--physical": "Laser Cryogénique",
+  "pokemob.move.subzero-slammer--special": "Laser Cryogénique",
+  "pokemob.move.devastating-drake--physical": "Chaos Draconique",
+  "pokemob.move.devastating-drake--special": "Chaos Draconique",
+  "pokemob.move.black-hole-eclipse--physical": "Trou Noir des Ombres",
+  "pokemob.move.black-hole-eclipse--special": "Trou Noir des Ombres",
+  "pokemob.move.twinkle-tackle--physical": "Impact Choupinova",
+  "pokemob.move.twinkle-tackle--special": "Impact Choupinova",
+  "pokemob.move.catastropika": "Pikachute Foudroyante",
+  "pokemob.move.shore-up": "Amass’Sable",
+  "pokemob.move.first-impression": "Escarmouche",
+  "pokemob.move.baneful-bunker": "Blockhaus",
+  "pokemob.move.spirit-shackle": "Tisse Ombre",
+  "pokemob.move.darkest-lariat": "Dark Lariat",
+  "pokemob.move.sparkling-aria": "Aria de l’Écume",
+  "pokemob.move.ice-hammer": "Marteau de Glace",
+  "pokemob.move.floral-healing": "Soin Floral",
+  "pokemob.move.high-horsepower": "Cavalerie Lourde",
+  "pokemob.move.strength-sap": "Vole-Force",
+  "pokemob.move.solar-blade": "Lame Solaire",
+  "pokemob.move.leafage": "Feuillage",
+  "pokemob.move.spotlight": "Projecteur",
+  "pokemob.move.toxic-thread": "Fil Toxique",
+  "pokemob.move.laser-focus": "Affilage",
+  "pokemob.move.gear-up": "Engrenage",
+  "pokemob.move.throat-chop": "Exécu-Son",
+  "pokemob.move.pollen-puff": "Boule Pollen",
+  "pokemob.move.anchor-shot": "Ancrage",
+  "pokemob.move.psychic-terrain": "Champ Psychique",
+  "pokemob.move.lunge": "Furie-Bond",
+  "pokemob.move.fire-lash": "Fouet de Feu",
+  "pokemob.move.power-trip": "Arrogance",
+  "pokemob.move.burn-up": "Flamme Ultime",
+  "pokemob.move.speed-swap": "Permuvitesse",
+  "pokemob.move.smart-strike": "Estocorne",
+  "pokemob.move.purify": "Purification",
+  "pokemob.move.revelation-dance": "Danse Éveil",
+  "pokemob.move.core-enforcer": "Sanction Suprême",
+  "pokemob.move.trop-kick": "Botte Sucrette",
+  "pokemob.move.instruct": "Sommation",
+  "pokemob.move.beak-blast": "Bec-Canon",
+  "pokemob.move.clanging-scales": "Vibrécaille",
+  "pokemob.move.dragon-hammer": "Draco-Marteau",
+  "pokemob.move.brutal-swing": "Centrifugifle",
+  "pokemob.move.aurora-veil": "Voile Aurore",
+  "pokemob.move.sinister-arrow-raid": "Fureur des Plumes Spectrales",
+  "pokemob.move.malicious-moonsault": "Dark Body Press",
+  "pokemob.move.oceanic-operetta": "Symphonie des Ondines",
+  "pokemob.move.guardian-of-alola": "Colère du Gardien d’Alola",
+  "pokemob.move.soul-stealing-7-star-strike": "Fauche-Âme des Sept Étoiles",
+  "pokemob.move.stoked-sparksurfer": "Électro-Surf Survolté",
+  "pokemob.move.pulverizing-pancake": "Gare au Ronflex",
+  "pokemob.move.extreme-evoboost": "Neuf pour Un",
+  "pokemob.move.genesis-supernova": "Supernova Originelle",
+  "pokemob.move.shell-trap": "Carapiège",
+  "pokemob.move.fleur-cannon": "Canon Floral",
+  "pokemob.move.psychic-fangs": "Psycho-Croc",
+  "pokemob.move.stomping-tantrum": "Trépignement",
+  "pokemob.move.shadow-bone": "Os Ombre",
+  "pokemob.move.accelerock": "Vif Roc",
+  "pokemob.move.liquidation": "Aqua-Brèche",
+  "pokemob.move.prismatic-laser": "Laser Prisme",
+  "pokemob.move.spectral-thief": "Clepto-Mânes",
+  "pokemob.move.sunsteel-strike": "Choc Météore",
+  "pokemob.move.moongeist-beam": "Rayon Spectral",
+  "pokemob.move.tearful-look": "Larme à l’Œil",
+  "pokemob.move.zing-zap": "Électrikipik",
+  "pokemob.move.natures-madness": "Ire de la Nature",
+  "pokemob.move.multi-attack": "Coup Varia-Type",
+  "pokemob.move.10-000-000-volt-thunderbolt": "Giga-Tonnerre",
+  "pokemob.move.mind-blown": "Caboche-Kaboum",
+  "pokemob.move.plasma-fists": "Plasma Punch",
+  "pokemob.move.photon-geyser": "Photo-Geyser",
+  "pokemob.move.light-that-burns-the-sky": "Apocalypsis Luminis",
+  "pokemob.move.searing-sunraze-smash": "Hélio-Choc Dévastateur",
+  "pokemob.move.menacing-moonraze-maelstrom": "Rayons Séléno-Explosifs",
+  "pokemob.move.lets-snuggle-forever": "Patati-Patattrape",
+  "pokemob.move.splintered-stormshards": "Hurlement des Roches-Lames",
+  "pokemob.move.clangorous-soulblaze": "Dracacophonie Flamboyante",
+  "pokemob.move.zippy-zap": "Pika-Sprint",
+  "pokemob.move.splishy-splash": "Pika-Splash",
+  "pokemob.move.floaty-fall": "Pika-Piqué",
+  "pokemob.move.pika-papow": "Pika-Fracas",
+  "pokemob.move.bouncy-bubble": "Évo-Thalasso",
+  "pokemob.move.buzzy-buzz": "Évo-Dynamo",
+  "pokemob.move.sizzly-slide": "Évo-Flambo",
+  "pokemob.move.glitzy-glow": "Évo-Psycho",
+  "pokemob.move.baddy-bad": "Évo-Ténébro",
+  "pokemob.move.sappy-seed": "Évo-Écolo",
+  "pokemob.move.freezy-frost": "Évo-Congélo",
+  "pokemob.move.sparkly-swirl": "Évo-Fabulo",
+  "pokemob.move.veevee-volley": "Évo-Chardasso",
+  "pokemob.move.double-iron-bash": "Écrous d’Poing",
+  "pokemob.move.max-guard": "Gardomax",
+  "pokemob.move.dynamax-cannon": "Canon Dynamax",
+  "pokemob.move.snipe-shot": "Tir de Précision",
+  "pokemob.move.jaw-lock": "Croque Fort",
+  "pokemob.move.stuff-cheeks": "Garde-à-Joues",
+  "pokemob.move.no-retreat": "Ultime Bastion",
+  "pokemob.move.tar-shot": "Goudronnage",
+  "pokemob.move.magic-powder": "Poudre Magique",
+  "pokemob.move.dragon-darts": "Draco-Flèches",
+  "pokemob.move.teatime": "Thérémonie",
+  "pokemob.move.octolock": "Octoprise",
+  "pokemob.move.bolt-beak": "Prise de Bec",
+  "pokemob.move.fishious-rend": "Branchicrok",
+  "pokemob.move.court-change": "Change-Côté",
+  "pokemob.move.max-flare": "Pyromax",
+  "pokemob.move.max-flutterby": "Insectomax",
+  "pokemob.move.max-lightning": "Fulguromax",
+  "pokemob.move.max-strike": "Normalomax",
+  "pokemob.move.max-knuckle": "Pugilomax",
+  "pokemob.move.max-phantasm": "Spectromax",
+  "pokemob.move.max-hailstorm": "Cryomax",
+  "pokemob.move.max-ooze": "Toxinomax",
+  "pokemob.move.max-geyser": "Hydromax",
+  "pokemob.move.max-airstream": "Aéromax",
+  "pokemob.move.max-starfall": "Enchantomax",
+  "pokemob.move.max-wyrmwind": "Dracomax",
+  "pokemob.move.max-mindstorm": "Psychomax",
+  "pokemob.move.max-rockfall": "Lithomax",
+  "pokemob.move.max-quake": "Sismomax",
+  "pokemob.move.max-darkness": "Sinistromax",
+  "pokemob.move.max-overgrowth": "Phytomax",
+  "pokemob.move.max-steelspike": "Métallomax",
+  "pokemob.move.clangorous-soul": "Dracacophonie",
+  "pokemob.move.body-press": "Big Splash",
+  "pokemob.move.decorate": "Nappage",
+  "pokemob.move.drum-beating": "Tambour Battant",
+  "pokemob.move.snap-trap": "Troquenard",
+  "pokemob.move.pyro-ball": "Ballon Brûlant",
+  "pokemob.move.behemoth-blade": "Gladius Maximus",
+  "pokemob.move.behemoth-bash": "Aegis Maxima",
+  "pokemob.move.aura-wheel": "Roue Libre",
+  "pokemob.move.breaking-swipe": "Abattage",
+  "pokemob.move.branch-poke": "Tapotige",
+  "pokemob.move.overdrive": "Overdrive",
+  "pokemob.move.apple-acid": "Acide Malique",
+  "pokemob.move.grav-apple": "Force G",
+  "pokemob.move.spirit-break": "Choc Émotionnel",
+  "pokemob.move.strange-steam": "Vapeur Féérique",
+  "pokemob.move.life-dew": "Fontaine de Vie",
+  "pokemob.move.obstruct": "Blocage",
+  "pokemob.move.false-surrender": "Fourbette",
+  "pokemob.move.meteor-assault": "Joute Astrale",
+  "pokemob.move.eternabeam": "Laser Infinimax",
+  "pokemob.move.steel-beam": "Métalaser",
+  "pokemob.move.expanding-force": "Vaste Pouvoir",
+  "pokemob.move.steel-roller": "Métalliroue",
+  "pokemob.move.scale-shot": "Rafale Écailles",
+  "pokemob.move.meteor-beam": "Laser Météore",
+  "pokemob.move.shell-side-arm": "Kokiyarme",
+  "pokemob.move.misty-explosion": "Explo-Brume",
+  "pokemob.move.grassy-glide": "Gliss’Herbe",
+  "pokemob.move.rising-voltage": "Monte-Tension",
+  "pokemob.move.terrain-pulse": "Champlification",
+  "pokemob.move.skitter-smack": "Ravage Rampant",
+  "pokemob.move.burning-jealousy": "Feu Envieux",
+  "pokemob.move.lash-out": "Cent Rancunes",
+  "pokemob.move.poltergeist": "Esprit Frappeur",
+  "pokemob.move.corrosive-gas": "Gaz Corrosif",
+  "pokemob.move.coaching": "Coaching",
+  "pokemob.move.flip-turn": "Eau Revoir",
+  "pokemob.move.triple-axel": "Triple Axel",
+  "pokemob.move.dual-wingbeat": "Double Volée",
+  "pokemob.move.scorching-sands": "Sable Ardent",
+  "pokemob.move.jungle-healing": "Selve Salvatrice",
+  "pokemob.move.wicked-blow": "Poing Obscur",
+  "pokemob.move.surging-strikes": "Torrent de Coups",
+  "pokemob.move.thunder-cage": "Voltageôle",
+  "pokemob.move.dragon-energy": "Draco-Énergie",
+  "pokemob.move.freezing-glare": "Regard Glaçant",
+  "pokemob.move.fiery-wrath": "Fureur Ardente",
+  "pokemob.move.thunderous-kick": "Coup Fulgurant",
+  "pokemob.move.glacial-lance": "Lance de Glace",
+  "pokemob.move.astral-barrage": "Éclat Spectral",
+  "pokemob.move.eerie-spell": "Sort Sinistre",
+  "pokemob.move.shadow-rush": "Charge Noire",
+  "pokemob.move.shadow-blast": "Aéro Noir",
+  "pokemob.move.shadow-blitz": "Assaut Noir",
+  "pokemob.move.shadow-bolt": "Éclair Noir",
+  "pokemob.move.shadow-break": "Bélier Noir",
+  "pokemob.move.shadow-chill": "Froid Noir",
+  "pokemob.move.shadow-end": "Retour Noir",
+  "pokemob.move.shadow-fire": "Ardeur Noir",
+  "pokemob.move.shadow-rave": "Rage Noire",
+  "pokemob.move.shadow-storm": "Typhon Noir",
+  "pokemob.move.shadow-wave": "Ondo Noire",
+  "pokemob.move.shadow-down": "Souffle Noir",
+  "pokemob.move.shadow-half": "Chute Noire",
+  "pokemob.move.shadow-hold": "Blocage Noir",
+  "pokemob.move.shadow-mist": "Brume Noire",
+  "pokemob.move.shadow-panic": "Folie Noire",
+  "pokemob.move.shadow-shed": "Percée Noire",
+  "pokemob.move.shadow-sky": "Ciel Noir"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/it_it.json b/src/main/resources/assets/pokecube_moves/lang/it_it.json
new file mode 100644
index 0000000000..3684887534
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/it_it.json
@@ -0,0 +1,846 @@
+{
+  "pokemob.move.pound": "Botta",
+  "pokemob.move.karate-chop": "Colpokarate",
+  "pokemob.move.double-slap": "Doppiasberla",
+  "pokemob.move.comet-punch": "Cometapugno",
+  "pokemob.move.mega-punch": "Megapugno",
+  "pokemob.move.pay-day": "Giornopaga",
+  "pokemob.move.fire-punch": "Fuocopugno",
+  "pokemob.move.ice-punch": "Gelopugno",
+  "pokemob.move.thunder-punch": "Tuonopugno",
+  "pokemob.move.scratch": "Graffio",
+  "pokemob.move.vice-grip": "Presa",
+  "pokemob.move.guillotine": "Ghigliottina",
+  "pokemob.move.razor-wind": "Ventagliente",
+  "pokemob.move.swords-dance": "Danzaspada",
+  "pokemob.move.cut": "Taglio",
+  "pokemob.move.gust": "Raffica",
+  "pokemob.move.wing-attack": "Attacco d’Ala",
+  "pokemob.move.whirlwind": "Turbine",
+  "pokemob.move.fly": "Volo",
+  "pokemob.move.bind": "Legatutto",
+  "pokemob.move.slam": "Schianto",
+  "pokemob.move.vine-whip": "Frustata",
+  "pokemob.move.stomp": "Pestone",
+  "pokemob.move.double-kick": "Doppiocalcio",
+  "pokemob.move.mega-kick": "Megacalcio",
+  "pokemob.move.jump-kick": "Calciosalto",
+  "pokemob.move.rolling-kick": "Calciorullo",
+  "pokemob.move.sand-attack": "Turbosabbia",
+  "pokemob.move.headbutt": "Bottintesta",
+  "pokemob.move.horn-attack": "Incornata",
+  "pokemob.move.fury-attack": "Furia",
+  "pokemob.move.horn-drill": "Perforcorno",
+  "pokemob.move.tackle": "Azione",
+  "pokemob.move.body-slam": "Corposcontro",
+  "pokemob.move.wrap": "Avvolgibotta",
+  "pokemob.move.take-down": "Riduttore",
+  "pokemob.move.thrash": "Colpo",
+  "pokemob.move.double-edge": "Sdoppiatore",
+  "pokemob.move.tail-whip": "Colpocoda",
+  "pokemob.move.poison-sting": "Velenospina",
+  "pokemob.move.twineedle": "Doppio Ago",
+  "pokemob.move.pin-missile": "Missilspillo",
+  "pokemob.move.leer": "Fulmisguardo",
+  "pokemob.move.bite": "Morso",
+  "pokemob.move.growl": "Ruggito",
+  "pokemob.move.roar": "Boato",
+  "pokemob.move.sing": "Canto",
+  "pokemob.move.supersonic": "Supersuono",
+  "pokemob.move.sonic-boom": "Sonicboom",
+  "pokemob.move.disable": "Inibitore",
+  "pokemob.move.acid": "Acido",
+  "pokemob.move.ember": "Braciere",
+  "pokemob.move.flamethrower": "Lanciafiamme",
+  "pokemob.move.mist": "Nebbia",
+  "pokemob.move.water-gun": "Pistolacqua",
+  "pokemob.move.hydro-pump": "Idropompa",
+  "pokemob.move.surf": "Surf",
+  "pokemob.move.ice-beam": "Geloraggio",
+  "pokemob.move.blizzard": "Bora",
+  "pokemob.move.psybeam": "Psicoraggio",
+  "pokemob.move.bubble-beam": "Bollaraggio",
+  "pokemob.move.aurora-beam": "Raggiaurora",
+  "pokemob.move.hyper-beam": "Iper Raggio",
+  "pokemob.move.peck": "Beccata",
+  "pokemob.move.drill-peck": "Perforbecco",
+  "pokemob.move.submission": "Sottomissione",
+  "pokemob.move.low-kick": "Colpo Basso",
+  "pokemob.move.counter": "Contrattacco",
+  "pokemob.move.seismic-toss": "Movim. Sismico",
+  "pokemob.move.strength": "Forza",
+  "pokemob.move.absorb": "Assorbimento",
+  "pokemob.move.mega-drain": "Megassorbimento",
+  "pokemob.move.leech-seed": "Parassiseme",
+  "pokemob.move.growth": "Crescita",
+  "pokemob.move.razor-leaf": "Foglielama",
+  "pokemob.move.solar-beam": "Solarraggio",
+  "pokemob.move.poison-powder": "Velenpolvere",
+  "pokemob.move.stun-spore": "Paralizzante",
+  "pokemob.move.sleep-powder": "Sonnifero",
+  "pokemob.move.petal-dance": "Petalodanza",
+  "pokemob.move.string-shot": "Millebave",
+  "pokemob.move.dragon-rage": "Ira di Drago",
+  "pokemob.move.fire-spin": "Turbofuoco",
+  "pokemob.move.thunder-shock": "Tuonoshock",
+  "pokemob.move.thunderbolt": "Fulmine",
+  "pokemob.move.thunder-wave": "Tuononda",
+  "pokemob.move.thunder": "Tuono",
+  "pokemob.move.rock-throw": "Sassata",
+  "pokemob.move.earthquake": "Terremoto",
+  "pokemob.move.fissure": "Abisso",
+  "pokemob.move.dig": "Fossa",
+  "pokemob.move.toxic": "Tossina",
+  "pokemob.move.confusion": "Confusione",
+  "pokemob.move.psychic": "Psichico",
+  "pokemob.move.hypnosis": "Ipnosi",
+  "pokemob.move.meditate": "Meditazione",
+  "pokemob.move.agility": "Agilità",
+  "pokemob.move.quick-attack": "Attacco Rapido",
+  "pokemob.move.rage": "Ira",
+  "pokemob.move.teleport": "Teletrasporto",
+  "pokemob.move.night-shade": "Ombra Notturna",
+  "pokemob.move.mimic": "Mimica",
+  "pokemob.move.screech": "Stridio",
+  "pokemob.move.double-team": "Doppioteam",
+  "pokemob.move.recover": "Ripresa",
+  "pokemob.move.harden": "Rafforzatore",
+  "pokemob.move.minimize": "Minimizzato",
+  "pokemob.move.smokescreen": "Muro di Fumo",
+  "pokemob.move.confuse-ray": "Stordiraggio",
+  "pokemob.move.withdraw": "Ritirata",
+  "pokemob.move.defense-curl": "Ricciolscudo",
+  "pokemob.move.barrier": "Barriera",
+  "pokemob.move.light-screen": "Schermoluce",
+  "pokemob.move.haze": "Nube",
+  "pokemob.move.reflect": "Riflesso",
+  "pokemob.move.focus-energy": "Focalenergia",
+  "pokemob.move.bide": "Pazienza",
+  "pokemob.move.metronome": "Metronomo",
+  "pokemob.move.mirror-move": "Speculmossa",
+  "pokemob.move.self-destruct": "Autodistruzione",
+  "pokemob.move.egg-bomb": "Uovobomba",
+  "pokemob.move.lick": "Leccata",
+  "pokemob.move.smog": "Smog",
+  "pokemob.move.sludge": "Fango",
+  "pokemob.move.bone-club": "Ossoclava",
+  "pokemob.move.fire-blast": "Fuocobomba",
+  "pokemob.move.waterfall": "Cascata",
+  "pokemob.move.clamp": "Tenaglia",
+  "pokemob.move.swift": "Comete",
+  "pokemob.move.skull-bash": "Capocciata",
+  "pokemob.move.spike-cannon": "Sparalance",
+  "pokemob.move.constrict": "Limitazione",
+  "pokemob.move.amnesia": "Amnesia",
+  "pokemob.move.kinesis": "Cinèsi",
+  "pokemob.move.soft-boiled": "Covauova",
+  "pokemob.move.high-jump-kick": "Calcinvolo",
+  "pokemob.move.glare": "Sguardo Feroce",
+  "pokemob.move.dream-eater": "Mangiasogni",
+  "pokemob.move.poison-gas": "Velenogas",
+  "pokemob.move.barrage": "Attacco Pioggia",
+  "pokemob.move.leech-life": "Sanguisuga",
+  "pokemob.move.lovely-kiss": "Demonbacio",
+  "pokemob.move.sky-attack": "Aeroattacco",
+  "pokemob.move.transform": "Trasformazione",
+  "pokemob.move.bubble": "Bolla",
+  "pokemob.move.dizzy-punch": "Stordipugno",
+  "pokemob.move.spore": "Spora",
+  "pokemob.move.flash": "Flash",
+  "pokemob.move.psywave": "Psiconda",
+  "pokemob.move.splash": "Splash",
+  "pokemob.move.acid-armor": "Scudo Acido",
+  "pokemob.move.crabhammer": "Martellata",
+  "pokemob.move.explosion": "Esplosione",
+  "pokemob.move.fury-swipes": "Sfuriate",
+  "pokemob.move.bonemerang": "Ossomerang",
+  "pokemob.move.rest": "Riposo",
+  "pokemob.move.rock-slide": "Frana",
+  "pokemob.move.hyper-fang": "Iperzanna",
+  "pokemob.move.sharpen": "Affilatore",
+  "pokemob.move.conversion": "Conversione",
+  "pokemob.move.tri-attack": "Tripletta",
+  "pokemob.move.super-fang": "Superzanna",
+  "pokemob.move.slash": "Lacerazione",
+  "pokemob.move.substitute": "Sostituto",
+  "pokemob.move.struggle": "Scontro",
+  "pokemob.move.sketch": "Schizzo",
+  "pokemob.move.triple-kick": "Triplocalcio",
+  "pokemob.move.thief": "Furto",
+  "pokemob.move.spider-web": "Ragnatela",
+  "pokemob.move.mind-reader": "Leggimente",
+  "pokemob.move.nightmare": "Incubo",
+  "pokemob.move.flame-wheel": "Ruotafuoco",
+  "pokemob.move.snore": "Russare",
+  "pokemob.move.curse": "Maledizione",
+  "pokemob.move.flail": "Flagello",
+  "pokemob.move.conversion-2": "Conversione2",
+  "pokemob.move.aeroblast": "Aerocolpo",
+  "pokemob.move.cotton-spore": "Cottonspora",
+  "pokemob.move.reversal": "Contropiede",
+  "pokemob.move.spite": "Dispetto",
+  "pokemob.move.powder-snow": "Polneve",
+  "pokemob.move.protect": "Protezione",
+  "pokemob.move.mach-punch": "Pugnorapido",
+  "pokemob.move.scary-face": "Visotruce",
+  "pokemob.move.feint-attack": "Finta",
+  "pokemob.move.sweet-kiss": "Dolcebacio",
+  "pokemob.move.belly-drum": "Panciamburo",
+  "pokemob.move.sludge-bomb": "Fangobomba",
+  "pokemob.move.mud-slap": "Fangosberla",
+  "pokemob.move.octazooka": "Octazooka",
+  "pokemob.move.spikes": "Punte",
+  "pokemob.move.zap-cannon": "Falcecannone",
+  "pokemob.move.foresight": "Preveggenza",
+  "pokemob.move.destiny-bond": "Destinobbligato",
+  "pokemob.move.perish-song": "Ultimocanto",
+  "pokemob.move.icy-wind": "Ventogelato",
+  "pokemob.move.detect": "Individua",
+  "pokemob.move.bone-rush": "Ossoraffica",
+  "pokemob.move.lock-on": "Localizza",
+  "pokemob.move.outrage": "Oltraggio",
+  "pokemob.move.sandstorm": "Terrempesta",
+  "pokemob.move.giga-drain": "Gigassorbimento",
+  "pokemob.move.endure": "Resistenza",
+  "pokemob.move.charm": "Fascino",
+  "pokemob.move.rollout": "Rotolamento",
+  "pokemob.move.false-swipe": "Falsofinale",
+  "pokemob.move.swagger": "Bullo",
+  "pokemob.move.milk-drink": "Buonlatte",
+  "pokemob.move.spark": "Scintilla",
+  "pokemob.move.fury-cutter": "Tagliofuria",
+  "pokemob.move.steel-wing": "Alacciaio",
+  "pokemob.move.mean-look": "Malosguardo",
+  "pokemob.move.attract": "Attrazione",
+  "pokemob.move.sleep-talk": "Sonnolalia",
+  "pokemob.move.heal-bell": "Rintoccasana",
+  "pokemob.move.return": "Ritorno",
+  "pokemob.move.present": "Regalino",
+  "pokemob.move.frustration": "Frustrazione",
+  "pokemob.move.safeguard": "Salvaguardia",
+  "pokemob.move.pain-split": "Malcomune",
+  "pokemob.move.sacred-fire": "Magifuoco",
+  "pokemob.move.magnitude": "Magnitudo",
+  "pokemob.move.dynamic-punch": "Dinamipugno",
+  "pokemob.move.megahorn": "Megacorno",
+  "pokemob.move.dragon-breath": "Dragospiro",
+  "pokemob.move.baton-pass": "Staffetta",
+  "pokemob.move.encore": "Ripeti",
+  "pokemob.move.pursuit": "Inseguimento",
+  "pokemob.move.rapid-spin": "Rapigiro",
+  "pokemob.move.sweet-scent": "Profumino",
+  "pokemob.move.iron-tail": "Codacciaio",
+  "pokemob.move.metal-claw": "Ferrartigli",
+  "pokemob.move.vital-throw": "Vitaltiro",
+  "pokemob.move.morning-sun": "Mattindoro",
+  "pokemob.move.synthesis": "Sintesi",
+  "pokemob.move.moonlight": "Lucelunare",
+  "pokemob.move.hidden-power": "Introforza",
+  "pokemob.move.cross-chop": "Incrocolpo",
+  "pokemob.move.twister": "Tornado",
+  "pokemob.move.rain-dance": "Pioggiadanza",
+  "pokemob.move.sunny-day": "Giornodisole",
+  "pokemob.move.crunch": "Sgranocchio",
+  "pokemob.move.mirror-coat": "Specchiovelo",
+  "pokemob.move.psych-up": "Psicamisù",
+  "pokemob.move.extreme-speed": "Extrarapido",
+  "pokemob.move.ancient-power": "Forzantica",
+  "pokemob.move.shadow-ball": "Palla Ombra",
+  "pokemob.move.future-sight": "Divinazione",
+  "pokemob.move.rock-smash": "Spaccaroccia",
+  "pokemob.move.whirlpool": "Mulinello",
+  "pokemob.move.beat-up": "Picchiaduro",
+  "pokemob.move.fake-out": "Bruciapelo",
+  "pokemob.move.uproar": "Baraonda",
+  "pokemob.move.stockpile": "Accumulo",
+  "pokemob.move.spit-up": "Sfoghenergia",
+  "pokemob.move.swallow": "Introenergia",
+  "pokemob.move.heat-wave": "Ondacalda",
+  "pokemob.move.hail": "Grandine",
+  "pokemob.move.torment": "Attaccalite",
+  "pokemob.move.flatter": "Adulazione",
+  "pokemob.move.will-o-wisp": "Fuocofatuo",
+  "pokemob.move.memento": "Memento",
+  "pokemob.move.facade": "Facciata",
+  "pokemob.move.focus-punch": "Centripugno",
+  "pokemob.move.smelling-salts": "Maniereforti",
+  "pokemob.move.follow-me": "Sonoqui",
+  "pokemob.move.nature-power": "Naturforza",
+  "pokemob.move.charge": "Sottocarica",
+  "pokemob.move.taunt": "Provocazione",
+  "pokemob.move.helping-hand": "Altruismo",
+  "pokemob.move.trick": "Raggiro",
+  "pokemob.move.role-play": "Giocodiruolo",
+  "pokemob.move.wish": "Desiderio",
+  "pokemob.move.assist": "Assistente",
+  "pokemob.move.ingrain": "Radicamento",
+  "pokemob.move.superpower": "Troppoforte",
+  "pokemob.move.magic-coat": "Magivelo",
+  "pokemob.move.recycle": "Riciclo",
+  "pokemob.move.revenge": "Vendetta",
+  "pokemob.move.brick-break": "Breccia",
+  "pokemob.move.yawn": "Sbadiglio",
+  "pokemob.move.knock-off": "Privazione",
+  "pokemob.move.endeavor": "Rimonta",
+  "pokemob.move.eruption": "Eruzione",
+  "pokemob.move.skill-swap": "Baratto",
+  "pokemob.move.imprison": "Esclusiva",
+  "pokemob.move.refresh": "Rinfrescata",
+  "pokemob.move.grudge": "Rancore",
+  "pokemob.move.snatch": "Scippo",
+  "pokemob.move.secret-power": "Forzasegreta",
+  "pokemob.move.dive": "Sub",
+  "pokemob.move.arm-thrust": "Sberletese",
+  "pokemob.move.camouflage": "Camuffamento",
+  "pokemob.move.tail-glow": "Codadiluce",
+  "pokemob.move.luster-purge": "Abbagliante",
+  "pokemob.move.mist-ball": "Foschisfera",
+  "pokemob.move.feather-dance": "Danzadipiume",
+  "pokemob.move.teeter-dance": "Strampadanza",
+  "pokemob.move.blaze-kick": "Calciardente",
+  "pokemob.move.mud-sport": "Fangata",
+  "pokemob.move.ice-ball": "Palla Gelo",
+  "pokemob.move.needle-arm": "Pugnospine",
+  "pokemob.move.slack-off": "Pigro",
+  "pokemob.move.hyper-voice": "Granvoce",
+  "pokemob.move.poison-fang": "Velenodenti",
+  "pokemob.move.crush-claw": "Tritartigli",
+  "pokemob.move.blast-burn": "Incendio",
+  "pokemob.move.hydro-cannon": "Idrocannone",
+  "pokemob.move.meteor-mash": "Meteorpugno",
+  "pokemob.move.astonish": "Sgomento",
+  "pokemob.move.weather-ball": "Palla Clima",
+  "pokemob.move.aromatherapy": "Aromaterapia",
+  "pokemob.move.fake-tears": "Falselacrime",
+  "pokemob.move.air-cutter": "Aerasoio",
+  "pokemob.move.overheat": "Vampata",
+  "pokemob.move.odor-sleuth": "Segugio",
+  "pokemob.move.rock-tomb": "Rocciotomba",
+  "pokemob.move.silver-wind": "Ventargenteo",
+  "pokemob.move.metal-sound": "Ferrostrido",
+  "pokemob.move.grass-whistle": "Meloderba",
+  "pokemob.move.tickle": "Solletico",
+  "pokemob.move.cosmic-power": "Cosmoforza",
+  "pokemob.move.water-spout": "Zampillo",
+  "pokemob.move.signal-beam": "Segnoraggio",
+  "pokemob.move.shadow-punch": "Pugnodombra",
+  "pokemob.move.extrasensory": "Extrasenso",
+  "pokemob.move.sky-uppercut": "Stramontante",
+  "pokemob.move.sand-tomb": "Sabbiotomba",
+  "pokemob.move.sheer-cold": "Purogelo",
+  "pokemob.move.muddy-water": "Fanghiglia",
+  "pokemob.move.bullet-seed": "Semitraglia",
+  "pokemob.move.aerial-ace": "Aeroassalto",
+  "pokemob.move.icicle-spear": "Gelolancia",
+  "pokemob.move.iron-defense": "Ferroscudo",
+  "pokemob.move.block": "Blocco",
+  "pokemob.move.howl": "Gridodilotta",
+  "pokemob.move.dragon-claw": "Dragartigli",
+  "pokemob.move.frenzy-plant": "Radicalbero",
+  "pokemob.move.bulk-up": "Granfisico",
+  "pokemob.move.bounce": "Rimbalzo",
+  "pokemob.move.mud-shot": "Colpodifango",
+  "pokemob.move.poison-tail": "Velenocoda",
+  "pokemob.move.covet": "Supplica",
+  "pokemob.move.volt-tackle": "Locomovolt",
+  "pokemob.move.magical-leaf": "Fogliamagica",
+  "pokemob.move.water-sport": "Docciascudo",
+  "pokemob.move.calm-mind": "Calmamente",
+  "pokemob.move.leaf-blade": "Fendifoglia",
+  "pokemob.move.dragon-dance": "Dragodanza",
+  "pokemob.move.rock-blast": "Cadutamassi",
+  "pokemob.move.shock-wave": "Ondashock",
+  "pokemob.move.water-pulse": "Idropulsar",
+  "pokemob.move.doom-desire": "Obbliderio",
+  "pokemob.move.psycho-boost": "Psicoslancio",
+  "pokemob.move.roost": "Trespolo",
+  "pokemob.move.gravity": "Gravità",
+  "pokemob.move.miracle-eye": "Miracolvista",
+  "pokemob.move.wake-up-slap": "Svegliopacca",
+  "pokemob.move.hammer-arm": "Martelpugno",
+  "pokemob.move.gyro-ball": "Vortexpalla",
+  "pokemob.move.healing-wish": "Curardore",
+  "pokemob.move.brine": "Acquadisale",
+  "pokemob.move.natural-gift": "Dononaturale",
+  "pokemob.move.feint": "Fintoattacco",
+  "pokemob.move.pluck": "Spennata",
+  "pokemob.move.tailwind": "Ventoincoda",
+  "pokemob.move.acupressure": "Acupressione",
+  "pokemob.move.metal-burst": "Metalscoppio",
+  "pokemob.move.u-turn": "Retromarcia",
+  "pokemob.move.close-combat": "Zuffa",
+  "pokemob.move.payback": "Rivincita",
+  "pokemob.move.assurance": "Garanzia",
+  "pokemob.move.embargo": "Divieto",
+  "pokemob.move.fling": "Lancio",
+  "pokemob.move.psycho-shift": "Psicotransfer",
+  "pokemob.move.trump-card": "Asso",
+  "pokemob.move.heal-block": "Anticura",
+  "pokemob.move.wring-out": "Strizzata",
+  "pokemob.move.power-trick": "Ingannoforza",
+  "pokemob.move.gastro-acid": "Gastroacido",
+  "pokemob.move.lucky-chant": "Fortuncanto",
+  "pokemob.move.me-first": "Precedenza",
+  "pokemob.move.copycat": "Copione",
+  "pokemob.move.power-swap": "Barattoforza",
+  "pokemob.move.guard-swap": "Barattoscudo",
+  "pokemob.move.punishment": "Punizione",
+  "pokemob.move.last-resort": "Ultimascelta",
+  "pokemob.move.worry-seed": "Affannoseme",
+  "pokemob.move.sucker-punch": "Sbigoattacco",
+  "pokemob.move.toxic-spikes": "Fielepunte",
+  "pokemob.move.heart-swap": "Cuorbaratto",
+  "pokemob.move.aqua-ring": "Acquanello",
+  "pokemob.move.magnet-rise": "Magnetascesa",
+  "pokemob.move.flare-blitz": "Fuococarica",
+  "pokemob.move.force-palm": "Palmoforza",
+  "pokemob.move.aura-sphere": "Forzasfera",
+  "pokemob.move.rock-polish": "Lucidatura",
+  "pokemob.move.poison-jab": "Velenpuntura",
+  "pokemob.move.dark-pulse": "Neropulsar",
+  "pokemob.move.night-slash": "Nottesferza",
+  "pokemob.move.aqua-tail": "Idrondata",
+  "pokemob.move.seed-bomb": "Semebomba",
+  "pokemob.move.air-slash": "Eterelama",
+  "pokemob.move.x-scissor": "Forbice X",
+  "pokemob.move.bug-buzz": "Ronzio",
+  "pokemob.move.dragon-pulse": "Dragopulsar",
+  "pokemob.move.dragon-rush": "Dragofuria",
+  "pokemob.move.power-gem": "Gemmoforza",
+  "pokemob.move.drain-punch": "Assorbipugno",
+  "pokemob.move.vacuum-wave": "Vuotonda",
+  "pokemob.move.focus-blast": "Focalcolpo",
+  "pokemob.move.energy-ball": "Energipalla",
+  "pokemob.move.brave-bird": "Baldeali",
+  "pokemob.move.earth-power": "Geoforza",
+  "pokemob.move.switcheroo": "Rapidscambio",
+  "pokemob.move.giga-impact": "Gigaimpatto",
+  "pokemob.move.nasty-plot": "Congiura",
+  "pokemob.move.bullet-punch": "Pugnoscarica",
+  "pokemob.move.avalanche": "Slavina",
+  "pokemob.move.ice-shard": "Geloscheggia",
+  "pokemob.move.shadow-claw": "Ombrartigli",
+  "pokemob.move.thunder-fang": "Fulmindenti",
+  "pokemob.move.ice-fang": "Gelodenti",
+  "pokemob.move.fire-fang": "Rogodenti",
+  "pokemob.move.shadow-sneak": "Furtivombra",
+  "pokemob.move.mud-bomb": "Pantanobomba",
+  "pokemob.move.psycho-cut": "Psicotaglio",
+  "pokemob.move.zen-headbutt": "Cozzata Zen",
+  "pokemob.move.mirror-shot": "Cristalcolpo",
+  "pokemob.move.flash-cannon": "Cannonflash",
+  "pokemob.move.rock-climb": "Scalaroccia",
+  "pokemob.move.defog": "Scacciabruma",
+  "pokemob.move.trick-room": "Distortozona",
+  "pokemob.move.draco-meteor": "Dragobolide",
+  "pokemob.move.discharge": "Scarica",
+  "pokemob.move.lava-plume": "Lavasbuffo",
+  "pokemob.move.leaf-storm": "Verdebufera",
+  "pokemob.move.power-whip": "Vigorcolpo",
+  "pokemob.move.rock-wrecker": "Devastomasso",
+  "pokemob.move.cross-poison": "Velenocroce",
+  "pokemob.move.gunk-shot": "Sporcolancio",
+  "pokemob.move.iron-head": "Metaltestata",
+  "pokemob.move.magnet-bomb": "Bombagnete",
+  "pokemob.move.stone-edge": "Pietrataglio",
+  "pokemob.move.captivate": "Incanto",
+  "pokemob.move.stealth-rock": "Levitoroccia",
+  "pokemob.move.grass-knot": "Laccioerboso",
+  "pokemob.move.chatter": "Schiamazzo",
+  "pokemob.move.judgment": "Giudizio",
+  "pokemob.move.bug-bite": "Coleomorso",
+  "pokemob.move.charge-beam": "Raggioscossa",
+  "pokemob.move.wood-hammer": "Mazzuolegno",
+  "pokemob.move.aqua-jet": "Acquagetto",
+  "pokemob.move.attack-order": "Comandourto",
+  "pokemob.move.defend-order": "Comandoscudo",
+  "pokemob.move.heal-order": "Comandocura",
+  "pokemob.move.head-smash": "Zuccata",
+  "pokemob.move.double-hit": "Doppiosmash",
+  "pokemob.move.roar-of-time": "Fragortempo",
+  "pokemob.move.spacial-rend": "Fendispazio",
+  "pokemob.move.lunar-dance": "Lunardanza",
+  "pokemob.move.crush-grip": "Sbriciolmano",
+  "pokemob.move.magma-storm": "Magmaclisma",
+  "pokemob.move.dark-void": "Vuototetro",
+  "pokemob.move.seed-flare": "Infuriaseme",
+  "pokemob.move.ominous-wind": "Funestovento",
+  "pokemob.move.shadow-force": "Oscurotuffo",
+  "pokemob.move.hone-claws": "Unghiaguzze",
+  "pokemob.move.wide-guard": "Bodyguard",
+  "pokemob.move.guard-split": "Paridifesa",
+  "pokemob.move.power-split": "Pariattacco",
+  "pokemob.move.wonder-room": "Mirabilzona",
+  "pokemob.move.psyshock": "Psicoshock",
+  "pokemob.move.venoshock": "Velenoshock",
+  "pokemob.move.autotomize": "Sganciapesi",
+  "pokemob.move.rage-powder": "Polverabbia",
+  "pokemob.move.telekinesis": "Telecinesi",
+  "pokemob.move.magic-room": "Magicozona",
+  "pokemob.move.smack-down": "Abbattimento",
+  "pokemob.move.storm-throw": "Tempestretta",
+  "pokemob.move.flame-burst": "Pirolancio",
+  "pokemob.move.sludge-wave": "Fangonda",
+  "pokemob.move.quiver-dance": "Eledanza",
+  "pokemob.move.heavy-slam": "Pesobomba",
+  "pokemob.move.synchronoise": "Sincrumore",
+  "pokemob.move.electro-ball": "Energisfera",
+  "pokemob.move.soak": "Inondazione",
+  "pokemob.move.flame-charge": "Nitrocarica",
+  "pokemob.move.coil": "Arrotola",
+  "pokemob.move.low-sweep": "Calciobasso",
+  "pokemob.move.acid-spray": "Acidobomba",
+  "pokemob.move.foul-play": "Ripicca",
+  "pokemob.move.simple-beam": "Ondisinvolta",
+  "pokemob.move.entrainment": "Saltamicizia",
+  "pokemob.move.after-you": "Cortesia",
+  "pokemob.move.round": "Coro",
+  "pokemob.move.echoed-voice": "Echeggiavoce",
+  "pokemob.move.chip-away": "Insidia",
+  "pokemob.move.clear-smog": "Pulifumo",
+  "pokemob.move.stored-power": "Veicolaforza",
+  "pokemob.move.quick-guard": "Anticipo",
+  "pokemob.move.ally-switch": "Cambiaposto",
+  "pokemob.move.scald": "Idrovampata",
+  "pokemob.move.shell-smash": "Gettaguscio",
+  "pokemob.move.heal-pulse": "Ondasana",
+  "pokemob.move.hex": "Sciagura",
+  "pokemob.move.sky-drop": "Cadutalibera",
+  "pokemob.move.shift-gear": "Cambiomarcia",
+  "pokemob.move.circle-throw": "Ribaltiro",
+  "pokemob.move.incinerate": "Bruciatutto",
+  "pokemob.move.quash": "Spintone",
+  "pokemob.move.acrobatics": "Acrobazia",
+  "pokemob.move.reflect-type": "Riflettipo",
+  "pokemob.move.retaliate": "Nemesi",
+  "pokemob.move.final-gambit": "Azzardo",
+  "pokemob.move.bestow": "Cediregalo",
+  "pokemob.move.inferno": "Marchiatura",
+  "pokemob.move.water-pledge": "Acquapatto",
+  "pokemob.move.fire-pledge": "Fiammapatto",
+  "pokemob.move.grass-pledge": "Erbapatto",
+  "pokemob.move.volt-switch": "Invertivolt",
+  "pokemob.move.struggle-bug": "Entomoblocco",
+  "pokemob.move.bulldoze": "Battiterra",
+  "pokemob.move.frost-breath": "Alitogelido",
+  "pokemob.move.dragon-tail": "Codadrago",
+  "pokemob.move.work-up": "Cuordileone",
+  "pokemob.move.electroweb": "Elettrotela",
+  "pokemob.move.wild-charge": "Sprizzalampo",
+  "pokemob.move.drill-run": "Giravvita",
+  "pokemob.move.dual-chop": "Doppiocolpo",
+  "pokemob.move.heart-stamp": "Cuorestampo",
+  "pokemob.move.horn-leech": "Legnicorno",
+  "pokemob.move.sacred-sword": "Spadasolenne",
+  "pokemob.move.razor-shell": "Conchilama",
+  "pokemob.move.heat-crash": "Marchiafuoco",
+  "pokemob.move.leaf-tornado": "Vorticerba",
+  "pokemob.move.steamroller": "Rulloduro",
+  "pokemob.move.cotton-guard": "Cotonscudo",
+  "pokemob.move.night-daze": "Urtoscuro",
+  "pokemob.move.psystrike": "Psicobotta",
+  "pokemob.move.tail-slap": "Spazzasberla",
+  "pokemob.move.hurricane": "Tifone",
+  "pokemob.move.head-charge": "Ricciolata",
+  "pokemob.move.gear-grind": "Ingracolpo",
+  "pokemob.move.searing-shot": "Sparafuoco",
+  "pokemob.move.techno-blast": "Tecnobotto",
+  "pokemob.move.relic-song": "Cantoantico",
+  "pokemob.move.secret-sword": "Spadamistica",
+  "pokemob.move.glaciate": "Gelamondo",
+  "pokemob.move.bolt-strike": "Lucesiluro",
+  "pokemob.move.blue-flare": "Fuocoblu",
+  "pokemob.move.fiery-dance": "Voldifuoco",
+  "pokemob.move.freeze-shock": "Elettrogelo",
+  "pokemob.move.ice-burn": "Vampagelida",
+  "pokemob.move.snarl": "Urlorabbia",
+  "pokemob.move.icicle-crash": "Scagliagelo",
+  "pokemob.move.v-create": "Generatore V",
+  "pokemob.move.fusion-flare": "Incrofiamma",
+  "pokemob.move.fusion-bolt": "Incrotuono",
+  "pokemob.move.flying-press": "Schiacciatuffo",
+  "pokemob.move.mat-block": "Ribaltappeto",
+  "pokemob.move.belch": "Rutto",
+  "pokemob.move.rototiller": "Aracampo",
+  "pokemob.move.sticky-web": "Rete Vischiosa",
+  "pokemob.move.fell-stinger": "Pungiglione",
+  "pokemob.move.phantom-force": "Spettrotuffo",
+  "pokemob.move.trick-or-treat": "Halloween",
+  "pokemob.move.noble-roar": "Urlo",
+  "pokemob.move.ion-deluge": "Pioggiaplasma",
+  "pokemob.move.parabolic-charge": "Caricaparabola",
+  "pokemob.move.forests-curse": "Boscomalocchio",
+  "pokemob.move.petal-blizzard": "Fiortempesta",
+  "pokemob.move.freeze-dry": "Liofilizzazione",
+  "pokemob.move.disarming-voice": "Incantavoce",
+  "pokemob.move.parting-shot": "Monito",
+  "pokemob.move.topsy-turvy": "Sottosopra",
+  "pokemob.move.draining-kiss": "Assorbibacio",
+  "pokemob.move.crafty-shield": "Truccodifesa",
+  "pokemob.move.flower-shield": "Fiordifesa",
+  "pokemob.move.grassy-terrain": "Campo Erboso",
+  "pokemob.move.misty-terrain": "Campo Nebbioso",
+  "pokemob.move.electrify": "Elettrocontagio",
+  "pokemob.move.play-rough": "Carineria",
+  "pokemob.move.fairy-wind": "Vento di Fata",
+  "pokemob.move.moonblast": "Forza Lunare",
+  "pokemob.move.boomburst": "Ondaboato",
+  "pokemob.move.fairy-lock": "Blocco Fatato",
+  "pokemob.move.kings-shield": "Scudo Reale",
+  "pokemob.move.play-nice": "Simpatia",
+  "pokemob.move.confide": "Confidenza",
+  "pokemob.move.diamond-storm": "Diamantempesta",
+  "pokemob.move.steam-eruption": "Vaporscoppio",
+  "pokemob.move.hyperspace-hole": "Forodimensionale",
+  "pokemob.move.water-shuriken": "Acqualame",
+  "pokemob.move.mystical-fire": "Magifiamma",
+  "pokemob.move.spiky-shield": "Agodifesa",
+  "pokemob.move.aromatic-mist": "Nebularoma",
+  "pokemob.move.eerie-impulse": "Elettromistero",
+  "pokemob.move.venom-drench": "Velenotrappola",
+  "pokemob.move.powder": "Pulviscoppio",
+  "pokemob.move.geomancy": "Geocontrollo",
+  "pokemob.move.magnetic-flux": "Controllo Polare",
+  "pokemob.move.happy-hour": "Cuccagna",
+  "pokemob.move.electric-terrain": "Campo Elettrico",
+  "pokemob.move.dazzling-gleam": "Magibrillio",
+  "pokemob.move.celebrate": "Auguri",
+  "pokemob.move.hold-hands": "Mano nella Mano",
+  "pokemob.move.baby-doll-eyes": "Occhioni Teneri",
+  "pokemob.move.nuzzle": "Elettrococcola",
+  "pokemob.move.hold-back": "Riguardo",
+  "pokemob.move.infestation": "Assillo",
+  "pokemob.move.power-up-punch": "Crescipugno",
+  "pokemob.move.oblivion-wing": "Ali del Fato",
+  "pokemob.move.thousand-arrows": "Mille Frecce",
+  "pokemob.move.thousand-waves": "Mille Onde",
+  "pokemob.move.lands-wrath": "Forza Tellurica",
+  "pokemob.move.light-of-ruin": "Luce Nefasta",
+  "pokemob.move.origin-pulse": "Primopulsar",
+  "pokemob.move.precipice-blades": "Spade Telluriche",
+  "pokemob.move.dragon-ascent": "Ascesa del Drago",
+  "pokemob.move.hyperspace-fury": "Urtodimensionale",
+  "pokemob.move.breakneck-blitz--physical": "Carica Travolgente",
+  "pokemob.move.breakneck-blitz--special": "Carica Travolgente",
+  "pokemob.move.all-out-pummeling--physical": "Iperscarica Furiosa",
+  "pokemob.move.all-out-pummeling--special": "Iperscarica Furiosa",
+  "pokemob.move.supersonic-skystrike--physical": "Picchiata Devastante",
+  "pokemob.move.supersonic-skystrike--special": "Picchiata Devastante",
+  "pokemob.move.acid-downpour--physical": "Acidiluvio Corrosivo",
+  "pokemob.move.acid-downpour--special": "Acidiluvio Corrosivo",
+  "pokemob.move.tectonic-rage--physical": "Furore della Terra",
+  "pokemob.move.tectonic-rage--special": "Furore della Terra",
+  "pokemob.move.continental-crush--physical": "Gigamacigno Polverizzante",
+  "pokemob.move.continental-crush--special": "Gigamacigno Polverizzante",
+  "pokemob.move.savage-spin-out--physical": "Bozzolo Fatale",
+  "pokemob.move.savage-spin-out--special": "Bozzolo Fatale",
+  "pokemob.move.never-ending-nightmare--physical": "Abbraccio Spettrale",
+  "pokemob.move.never-ending-nightmare--special": "Abbraccio Spettrale",
+  "pokemob.move.corkscrew-crash--physical": "Spirale Perforante",
+  "pokemob.move.corkscrew-crash--special": "Spirale Perforante",
+  "pokemob.move.inferno-overdrive--physical": "Fiammobomba Detonante",
+  "pokemob.move.inferno-overdrive--special": "Fiammobomba Detonante",
+  "pokemob.move.hydro-vortex--physical": "Idrovortice Abissale",
+  "pokemob.move.hydro-vortex--special": "Idrovortice Abissale",
+  "pokemob.move.bloom-doom--physical": "Floriscoppio Sfolgorante",
+  "pokemob.move.bloom-doom--special": "Floriscoppio Sfolgorante",
+  "pokemob.move.gigavolt-havoc--physical": "Gigascarica Folgorante",
+  "pokemob.move.gigavolt-havoc--special": "Gigascarica Folgorante",
+  "pokemob.move.shattered-psyche--physical": "Impatto Psicocinetico",
+  "pokemob.move.shattered-psyche--special": "Impatto Psicocinetico",
+  "pokemob.move.subzero-slammer--physical": "Criodistruzione Polare",
+  "pokemob.move.subzero-slammer--special": "Criodistruzione Polare",
+  "pokemob.move.devastating-drake--physical": "Dragoschianto Finale",
+  "pokemob.move.devastating-drake--special": "Dragoschianto Finale",
+  "pokemob.move.black-hole-eclipse--physical": "Buco Nero del Non Ritorno",
+  "pokemob.move.black-hole-eclipse--special": "Buco Nero del Non Ritorno",
+  "pokemob.move.twinkle-tackle--physical": "Astroimpatto Fatato",
+  "pokemob.move.twinkle-tackle--special": "Astroimpatto Fatato",
+  "pokemob.move.catastropika": "Super Pikaboom",
+  "pokemob.move.shore-up": "Sabbiaccumulo",
+  "pokemob.move.first-impression": "Schermaglia",
+  "pokemob.move.baneful-bunker": "Fortino",
+  "pokemob.move.spirit-shackle": "Cucitura d’Ombra",
+  "pokemob.move.darkest-lariat": "Braccioteso",
+  "pokemob.move.sparkling-aria": "Canto Effimero",
+  "pokemob.move.ice-hammer": "Martelgelo",
+  "pokemob.move.floral-healing": "Cura Floreale",
+  "pokemob.move.high-horsepower": "Forza Equina",
+  "pokemob.move.strength-sap": "Assorbiforza",
+  "pokemob.move.solar-blade": "Lama Solare",
+  "pokemob.move.leafage": "Fogliame",
+  "pokemob.move.spotlight": "Riflettore",
+  "pokemob.move.toxic-thread": "Velenotela",
+  "pokemob.move.laser-focus": "Concentrazione",
+  "pokemob.move.gear-up": "Marciainpiù",
+  "pokemob.move.throat-chop": "Colpo Infernale",
+  "pokemob.move.pollen-puff": "Sferapolline",
+  "pokemob.move.anchor-shot": "Colpo d’Ancora",
+  "pokemob.move.psychic-terrain": "Campo Psichico",
+  "pokemob.move.lunge": "Assalto",
+  "pokemob.move.fire-lash": "Frusta di Fuoco",
+  "pokemob.move.power-trip": "Tracotanza",
+  "pokemob.move.burn-up": "Ultima Fiamma",
+  "pokemob.move.speed-swap": "Velociscambio",
+  "pokemob.move.smart-strike": "Sottilcorno",
+  "pokemob.move.purify": "Purificazione",
+  "pokemob.move.revelation-dance": "Mutadanza",
+  "pokemob.move.core-enforcer": "Nucleocastigo",
+  "pokemob.move.trop-kick": "Tropicalcio",
+  "pokemob.move.instruct": "Imposizione",
+  "pokemob.move.beak-blast": "Cannonbecco",
+  "pokemob.move.clanging-scales": "Clamorsquame",
+  "pokemob.move.dragon-hammer": "Marteldrago",
+  "pokemob.move.brutal-swing": "Vorticolpo",
+  "pokemob.move.aurora-veil": "Velaurora",
+  "pokemob.move.sinister-arrow-raid": "Dardoassalto Spettrale",
+  "pokemob.move.malicious-moonsault": "Iperschianto delle Tenebre",
+  "pokemob.move.oceanic-operetta": "Sinfonia del Mare",
+  "pokemob.move.guardian-of-alola": "Collera del Guardiano",
+  "pokemob.move.soul-stealing-7-star-strike": "Colpo Eptastellare Rubanima",
+  "pokemob.move.stoked-sparksurfer": "Elettrosurf Folgorante",
+  "pokemob.move.pulverizing-pancake": "Adesso Faccio sul Serio",
+  "pokemob.move.extreme-evoboost": "Potenziamento Eevolutivo",
+  "pokemob.move.genesis-supernova": "Supernova delle Origini",
+  "pokemob.move.shell-trap": "Gusciotrappola",
+  "pokemob.move.fleur-cannon": "Cannonfiore",
+  "pokemob.move.psychic-fangs": "Psicozanna",
+  "pokemob.move.stomping-tantrum": "Battipiedi",
+  "pokemob.move.shadow-bone": "Ossotetro",
+  "pokemob.move.accelerock": "Rocciarapida",
+  "pokemob.move.liquidation": "Idrobreccia",
+  "pokemob.move.prismatic-laser": "Prismalaser",
+  "pokemob.move.spectral-thief": "Ombrafurto",
+  "pokemob.move.sunsteel-strike": "Astrocarica",
+  "pokemob.move.moongeist-beam": "Raggio d’Ombra",
+  "pokemob.move.tearful-look": "Occhionilucidi",
+  "pokemob.move.zing-zap": "Elettropizzico",
+  "pokemob.move.natures-madness": "Ira della Natura",
+  "pokemob.move.multi-attack": "Multiattacco",
+  "pokemob.move.10-000-000-volt-thunderbolt": "Iperfulmine",
+  "pokemob.move.mind-blown": "Sbalorditesta",
+  "pokemob.move.plasma-fists": "Pugni Plasma",
+  "pokemob.move.photon-geyser": "Geyser Fotonico",
+  "pokemob.move.light-that-burns-the-sky": "Fotodistruzione Apocalittica",
+  "pokemob.move.searing-sunraze-smash": "Supercollisione Solare",
+  "pokemob.move.menacing-moonraze-maelstrom": "Deflagrazione Lunare",
+  "pokemob.move.lets-snuggle-forever": "Dolcesacco di Botte",
+  "pokemob.move.splintered-stormshards": "Litotempesta Radiale",
+  "pokemob.move.clangorous-soulblaze": "Dracofonia Divampante",
+  "pokemob.move.zippy-zap": "Sprintaboom",
+  "pokemob.move.splishy-splash": "Surfasplash",
+  "pokemob.move.floaty-fall": "Piombaflap",
+  "pokemob.move.pika-papow": "Pikasaetta",
+  "pokemob.move.bouncy-bubble": "Bollaslurp",
+  "pokemob.move.buzzy-buzz": "Elettrozap",
+  "pokemob.move.sizzly-slide": "Fiammabam",
+  "pokemob.move.glitzy-glow": "Auraswoosh",
+  "pokemob.move.baddy-bad": "Zona Buiabuia",
+  "pokemob.move.sappy-seed": "Bombafrush",
+  "pokemob.move.freezy-frost": "Scricchiagelo",
+  "pokemob.move.sparkly-swirl": "Sbrilluccibufera",
+  "pokemob.move.veevee-volley": "Eeveempatto",
+  "pokemob.move.double-iron-bash": "Pugni Corazzati",
+  "pokemob.move.max-guard": "Dynabarriera",
+  "pokemob.move.dynamax-cannon": "Cannone Dynamax",
+  "pokemob.move.snipe-shot": "Tiromirato",
+  "pokemob.move.jaw-lock": "Morsostretto",
+  "pokemob.move.stuff-cheeks": "Riempiguance",
+  "pokemob.move.no-retreat": "Spalle al Muro",
+  "pokemob.move.tar-shot": "Colpocatrame",
+  "pokemob.move.magic-powder": "Magipolvere",
+  "pokemob.move.dragon-darts": "Dragofrecce",
+  "pokemob.move.teatime": "Ora del Tè",
+  "pokemob.move.octolock": "Tentacolock",
+  "pokemob.move.bolt-beak": "Beccoshock",
+  "pokemob.move.fishious-rend": "Branchiomorso",
+  "pokemob.move.court-change": "Cambiocampo",
+  "pokemob.move.max-flare": "Dynafiammata",
+  "pokemob.move.max-flutterby": "Dynainsetto",
+  "pokemob.move.max-lightning": "Dynasaetta",
+  "pokemob.move.max-strike": "Dynattacco",
+  "pokemob.move.max-knuckle": "Dynapugno",
+  "pokemob.move.max-phantasm": "Dynavuoto",
+  "pokemob.move.max-hailstorm": "Dynagelo",
+  "pokemob.move.max-ooze": "Dynacorrosione",
+  "pokemob.move.max-geyser": "Dynaflusso",
+  "pokemob.move.max-airstream": "Dynajet",
+  "pokemob.move.max-starfall": "Dynafata",
+  "pokemob.move.max-wyrmwind": "Dynadragone",
+  "pokemob.move.max-mindstorm": "Dynapsiche",
+  "pokemob.move.max-rockfall": "Dynamacigno",
+  "pokemob.move.max-quake": "Dynasisma",
+  "pokemob.move.max-darkness": "Dynatenebre",
+  "pokemob.move.max-overgrowth": "Dynaflora",
+  "pokemob.move.max-steelspike": "Dynametallo",
+  "pokemob.move.clangorous-soul": "Dracofonia",
+  "pokemob.move.body-press": "Schiacciacorpo",
+  "pokemob.move.decorate": "Decorazione",
+  "pokemob.move.drum-beating": "Tamburattacco",
+  "pokemob.move.snap-trap": "Tagliola",
+  "pokemob.move.pyro-ball": "Palla Infuocata",
+  "pokemob.move.behemoth-blade": "Taglio Maestoso",
+  "pokemob.move.behemoth-bash": "Colpo Maestoso",
+  "pokemob.move.aura-wheel": "Ruota d’Aura",
+  "pokemob.move.breaking-swipe": "Vastoimpatto",
+  "pokemob.move.branch-poke": "Ramostoccata",
+  "pokemob.move.overdrive": "Overdrive",
+  "pokemob.move.apple-acid": "Acido Malico",
+  "pokemob.move.grav-apple": "Forza G",
+  "pokemob.move.spirit-break": "Frantumanima",
+  "pokemob.move.strange-steam": "Vapore Incantato",
+  "pokemob.move.life-dew": "Goccia Vitale",
+  "pokemob.move.obstruct": "Sbarramento",
+  "pokemob.move.false-surrender": "Supplicolpo",
+  "pokemob.move.meteor-assault": "Sfolgorassalto",
+  "pokemob.move.eternabeam": "Raggio Infinito",
+  "pokemob.move.steel-beam": "Raggio d’Acciaio",
+  "pokemob.move.expanding-force": "Vastenergia",
+  "pokemob.move.steel-roller": "Ferrorullo",
+  "pokemob.move.scale-shot": "Squamacolpo",
+  "pokemob.move.meteor-beam": "Raggiometeora",
+  "pokemob.move.shell-side-arm": "Armaguscio",
+  "pokemob.move.misty-explosion": "Nebbioscoppio",
+  "pokemob.move.grassy-glide": "Erboscivolata",
+  "pokemob.move.rising-voltage": "Elettroimpennata",
+  "pokemob.move.terrain-pulse": "Campopulsar",
+  "pokemob.move.skitter-smack": "Strisciacolpo",
+  "pokemob.move.burning-jealousy": "Fiamminvidia",
+  "pokemob.move.lash-out": "Sfogarabbia",
+  "pokemob.move.poltergeist": "Poltergeist",
+  "pokemob.move.corrosive-gas": "Gas Corrosivo",
+  "pokemob.move.coaching": "Coaching",
+  "pokemob.move.flip-turn": "Virata",
+  "pokemob.move.triple-axel": "Triplo Axel",
+  "pokemob.move.dual-wingbeat": "Doppia Ala",
+  "pokemob.move.scorching-sands": "Sabbiardente",
+  "pokemob.move.jungle-healing": "Giunglacura",
+  "pokemob.move.wicked-blow": "Pugnotenebra",
+  "pokemob.move.surging-strikes": "Idroraffica",
+  "pokemob.move.thunder-cage": "Elettrogabbia",
+  "pokemob.move.dragon-energy": "Dragoenergia",
+  "pokemob.move.freezing-glare": "Sguardo Gelido",
+  "pokemob.move.fiery-wrath": "Furia Ardente",
+  "pokemob.move.thunderous-kick": "Calcio Tonante",
+  "pokemob.move.glacial-lance": "Lancia Glaciale",
+  "pokemob.move.astral-barrage": "Schegge Astrali",
+  "pokemob.move.eerie-spell": "Inquietantesimo",
+  "pokemob.move.shadow-rush": "Ombroraffica",
+  "pokemob.move.shadow-blast": "Ombrolame",
+  "pokemob.move.shadow-blitz": "Ombrattacco",
+  "pokemob.move.shadow-bolt": "Fulminombra",
+  "pokemob.move.shadow-break": "Ombrospinta",
+  "pokemob.move.shadow-chill": "Gelodombra",
+  "pokemob.move.shadow-end": "Fineoscuro",
+  "pokemob.move.shadow-fire": "Fuocoscuro",
+  "pokemob.move.shadow-rave": "Ombrolancia",
+  "pokemob.move.shadow-storm": "Turbinombra",
+  "pokemob.move.shadow-wave": "Ondascura",
+  "pokemob.move.shadow-down": "Declinoscuro",
+  "pokemob.move.shadow-half": "Iraoscura",
+  "pokemob.move.shadow-hold": "Retedombra",
+  "pokemob.move.shadow-mist": "Nebbiascura",
+  "pokemob.move.shadow-panic": "Ombrapanico",
+  "pokemob.move.shadow-shed": "Ombrannulla",
+  "pokemob.move.shadow-sky": "Cieloscuro"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/ja_jp.json b/src/main/resources/assets/pokecube_moves/lang/ja_jp.json
new file mode 100644
index 0000000000..9ddad0cc22
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/ja_jp.json
@@ -0,0 +1,846 @@
+{
+  "pokemob.move.pound": "はたく",
+  "pokemob.move.karate-chop": "からてチョップ",
+  "pokemob.move.double-slap": "おうふくビンタ",
+  "pokemob.move.comet-punch": "れんぞくパンチ",
+  "pokemob.move.mega-punch": "メガトンパンチ",
+  "pokemob.move.pay-day": "ネコにこばん",
+  "pokemob.move.fire-punch": "ほのおのパンチ",
+  "pokemob.move.ice-punch": "れいとうパンチ",
+  "pokemob.move.thunder-punch": "かみなりパンチ",
+  "pokemob.move.scratch": "ひっかく",
+  "pokemob.move.vice-grip": "はさむ",
+  "pokemob.move.guillotine": "ハサミギロチン",
+  "pokemob.move.razor-wind": "かまいたち",
+  "pokemob.move.swords-dance": "つるぎのまい",
+  "pokemob.move.cut": "いあいぎり",
+  "pokemob.move.gust": "かぜおこし",
+  "pokemob.move.wing-attack": "つばさでうつ",
+  "pokemob.move.whirlwind": "ふきとばし",
+  "pokemob.move.fly": "そらをとぶ",
+  "pokemob.move.bind": "しめつける",
+  "pokemob.move.slam": "たたきつける",
+  "pokemob.move.vine-whip": "つるのムチ",
+  "pokemob.move.stomp": "ふみつけ",
+  "pokemob.move.double-kick": "にどげり",
+  "pokemob.move.mega-kick": "メガトンキック",
+  "pokemob.move.jump-kick": "とびげり",
+  "pokemob.move.rolling-kick": "まわしげり",
+  "pokemob.move.sand-attack": "すなかけ",
+  "pokemob.move.headbutt": "ずつき",
+  "pokemob.move.horn-attack": "つのでつく",
+  "pokemob.move.fury-attack": "みだれづき",
+  "pokemob.move.horn-drill": "つのドリル",
+  "pokemob.move.tackle": "たいあたり",
+  "pokemob.move.body-slam": "のしかかり",
+  "pokemob.move.wrap": "まきつく",
+  "pokemob.move.take-down": "とっしん",
+  "pokemob.move.thrash": "あばれる",
+  "pokemob.move.double-edge": "すてみタックル",
+  "pokemob.move.tail-whip": "しっぽをふる",
+  "pokemob.move.poison-sting": "どくばり",
+  "pokemob.move.twineedle": "ダブルニードル",
+  "pokemob.move.pin-missile": "ミサイルばり",
+  "pokemob.move.leer": "にらみつける",
+  "pokemob.move.bite": "かみつく",
+  "pokemob.move.growl": "なきごえ",
+  "pokemob.move.roar": "ほえる",
+  "pokemob.move.sing": "うたう",
+  "pokemob.move.supersonic": "ちょうおんぱ",
+  "pokemob.move.sonic-boom": "ソニックブーム",
+  "pokemob.move.disable": "かなしばり",
+  "pokemob.move.acid": "ようかいえき",
+  "pokemob.move.ember": "ひのこ",
+  "pokemob.move.flamethrower": "かえんほうしゃ",
+  "pokemob.move.mist": "しろいきり",
+  "pokemob.move.water-gun": "みずでっぽう",
+  "pokemob.move.hydro-pump": "ハイドロポンプ",
+  "pokemob.move.surf": "なみのり",
+  "pokemob.move.ice-beam": "れいとうビーム",
+  "pokemob.move.blizzard": "ふぶき",
+  "pokemob.move.psybeam": "サイケこうせん",
+  "pokemob.move.bubble-beam": "バブルこうせん",
+  "pokemob.move.aurora-beam": "オーロラビーム",
+  "pokemob.move.hyper-beam": "はかいこうせん",
+  "pokemob.move.peck": "つつく",
+  "pokemob.move.drill-peck": "ドリルくちばし",
+  "pokemob.move.submission": "じごくぐるま",
+  "pokemob.move.low-kick": "けたぐり",
+  "pokemob.move.counter": "カウンター",
+  "pokemob.move.seismic-toss": "ちきゅうなげ",
+  "pokemob.move.strength": "かいりき",
+  "pokemob.move.absorb": "すいとる",
+  "pokemob.move.mega-drain": "メガドレイン",
+  "pokemob.move.leech-seed": "やどりぎのタネ",
+  "pokemob.move.growth": "せいちょう",
+  "pokemob.move.razor-leaf": "はっぱカッター",
+  "pokemob.move.solar-beam": "ソーラービーム",
+  "pokemob.move.poison-powder": "どくのこな",
+  "pokemob.move.stun-spore": "しびれごな",
+  "pokemob.move.sleep-powder": "ねむりごな",
+  "pokemob.move.petal-dance": "はなびらのまい",
+  "pokemob.move.string-shot": "いとをはく",
+  "pokemob.move.dragon-rage": "りゅうのいかり",
+  "pokemob.move.fire-spin": "ほのおのうず",
+  "pokemob.move.thunder-shock": "でんきショック",
+  "pokemob.move.thunderbolt": "１０まんボルト",
+  "pokemob.move.thunder-wave": "でんじは",
+  "pokemob.move.thunder": "かみなり",
+  "pokemob.move.rock-throw": "いわおとし",
+  "pokemob.move.earthquake": "じしん",
+  "pokemob.move.fissure": "じわれ",
+  "pokemob.move.dig": "あなをほる",
+  "pokemob.move.toxic": "どくどく",
+  "pokemob.move.confusion": "ねんりき",
+  "pokemob.move.psychic": "サイコキネシス",
+  "pokemob.move.hypnosis": "さいみんじゅつ",
+  "pokemob.move.meditate": "ヨガのポーズ",
+  "pokemob.move.agility": "こうそくいどう",
+  "pokemob.move.quick-attack": "でんこうせっか",
+  "pokemob.move.rage": "いかり",
+  "pokemob.move.teleport": "テレポート",
+  "pokemob.move.night-shade": "ナイトヘッド",
+  "pokemob.move.mimic": "ものまね",
+  "pokemob.move.screech": "いやなおと",
+  "pokemob.move.double-team": "かげぶんしん",
+  "pokemob.move.recover": "じこさいせい",
+  "pokemob.move.harden": "かたくなる",
+  "pokemob.move.minimize": "ちいさくなる",
+  "pokemob.move.smokescreen": "えんまく",
+  "pokemob.move.confuse-ray": "あやしいひかり",
+  "pokemob.move.withdraw": "からにこもる",
+  "pokemob.move.defense-curl": "まるくなる",
+  "pokemob.move.barrier": "バリアー",
+  "pokemob.move.light-screen": "ひかりのかべ",
+  "pokemob.move.haze": "くろいきり",
+  "pokemob.move.reflect": "リフレクター",
+  "pokemob.move.focus-energy": "きあいだめ",
+  "pokemob.move.bide": "がまん",
+  "pokemob.move.metronome": "ゆびをふる",
+  "pokemob.move.mirror-move": "オウムがえし",
+  "pokemob.move.self-destruct": "じばく",
+  "pokemob.move.egg-bomb": "タマゴばくだん",
+  "pokemob.move.lick": "したでなめる",
+  "pokemob.move.smog": "スモッグ",
+  "pokemob.move.sludge": "ヘドロこうげき",
+  "pokemob.move.bone-club": "ホネこんぼう",
+  "pokemob.move.fire-blast": "だいもんじ",
+  "pokemob.move.waterfall": "たきのぼり",
+  "pokemob.move.clamp": "からではさむ",
+  "pokemob.move.swift": "スピードスター",
+  "pokemob.move.skull-bash": "ロケットずつき",
+  "pokemob.move.spike-cannon": "とげキャノン",
+  "pokemob.move.constrict": "からみつく",
+  "pokemob.move.amnesia": "ドわすれ",
+  "pokemob.move.kinesis": "スプーンまげ",
+  "pokemob.move.soft-boiled": "タマゴうみ",
+  "pokemob.move.high-jump-kick": "とびひざげり",
+  "pokemob.move.glare": "へびにらみ",
+  "pokemob.move.dream-eater": "ゆめくい",
+  "pokemob.move.poison-gas": "どくガス",
+  "pokemob.move.barrage": "たまなげ",
+  "pokemob.move.leech-life": "きゅうけつ",
+  "pokemob.move.lovely-kiss": "あくまのキッス",
+  "pokemob.move.sky-attack": "ゴッドバード",
+  "pokemob.move.transform": "へんしん",
+  "pokemob.move.bubble": "あわ",
+  "pokemob.move.dizzy-punch": "ピヨピヨパンチ",
+  "pokemob.move.spore": "キノコのほうし",
+  "pokemob.move.flash": "フラッシュ",
+  "pokemob.move.psywave": "サイコウェーブ",
+  "pokemob.move.splash": "はねる",
+  "pokemob.move.acid-armor": "とける",
+  "pokemob.move.crabhammer": "クラブハンマー",
+  "pokemob.move.explosion": "だいばくはつ",
+  "pokemob.move.fury-swipes": "みだれひっかき",
+  "pokemob.move.bonemerang": "ホネブーメラン",
+  "pokemob.move.rest": "ねむる",
+  "pokemob.move.rock-slide": "いわなだれ",
+  "pokemob.move.hyper-fang": "ひっさつまえば",
+  "pokemob.move.sharpen": "かくばる",
+  "pokemob.move.conversion": "テクスチャー",
+  "pokemob.move.tri-attack": "トライアタック",
+  "pokemob.move.super-fang": "いかりのまえば",
+  "pokemob.move.slash": "きりさく",
+  "pokemob.move.substitute": "みがわり",
+  "pokemob.move.struggle": "わるあがき",
+  "pokemob.move.sketch": "スケッチ",
+  "pokemob.move.triple-kick": "トリプルキック",
+  "pokemob.move.thief": "どろぼう",
+  "pokemob.move.spider-web": "クモのす",
+  "pokemob.move.mind-reader": "こころのめ",
+  "pokemob.move.nightmare": "あくむ",
+  "pokemob.move.flame-wheel": "かえんぐるま",
+  "pokemob.move.snore": "いびき",
+  "pokemob.move.curse": "のろい",
+  "pokemob.move.flail": "じたばた",
+  "pokemob.move.conversion-2": "テクスチャー２",
+  "pokemob.move.aeroblast": "エアロブラスト",
+  "pokemob.move.cotton-spore": "わたほうし",
+  "pokemob.move.reversal": "きしかいせい",
+  "pokemob.move.spite": "うらみ",
+  "pokemob.move.powder-snow": "こなゆき",
+  "pokemob.move.protect": "まもる",
+  "pokemob.move.mach-punch": "マッハパンチ",
+  "pokemob.move.scary-face": "こわいかお",
+  "pokemob.move.feint-attack": "だましうち",
+  "pokemob.move.sweet-kiss": "てんしのキッス",
+  "pokemob.move.belly-drum": "はらだいこ",
+  "pokemob.move.sludge-bomb": "ヘドロばくだん",
+  "pokemob.move.mud-slap": "どろかけ",
+  "pokemob.move.octazooka": "オクタンほう",
+  "pokemob.move.spikes": "まきびし",
+  "pokemob.move.zap-cannon": "でんじほう",
+  "pokemob.move.foresight": "みやぶる",
+  "pokemob.move.destiny-bond": "みちづれ",
+  "pokemob.move.perish-song": "ほろびのうた",
+  "pokemob.move.icy-wind": "こごえるかぜ",
+  "pokemob.move.detect": "みきり",
+  "pokemob.move.bone-rush": "ボーンラッシュ",
+  "pokemob.move.lock-on": "ロックオン",
+  "pokemob.move.outrage": "げきりん",
+  "pokemob.move.sandstorm": "すなあらし",
+  "pokemob.move.giga-drain": "ギガドレイン",
+  "pokemob.move.endure": "こらえる",
+  "pokemob.move.charm": "あまえる",
+  "pokemob.move.rollout": "ころがる",
+  "pokemob.move.false-swipe": "みねうち",
+  "pokemob.move.swagger": "いばる",
+  "pokemob.move.milk-drink": "ミルクのみ",
+  "pokemob.move.spark": "スパーク",
+  "pokemob.move.fury-cutter": "れんぞくぎり",
+  "pokemob.move.steel-wing": "はがねのつばさ",
+  "pokemob.move.mean-look": "くろいまなざし",
+  "pokemob.move.attract": "メロメロ",
+  "pokemob.move.sleep-talk": "ねごと",
+  "pokemob.move.heal-bell": "いやしのすず",
+  "pokemob.move.return": "おんがえし",
+  "pokemob.move.present": "プレゼント",
+  "pokemob.move.frustration": "やつあたり",
+  "pokemob.move.safeguard": "しんぴのまもり",
+  "pokemob.move.pain-split": "いたみわけ",
+  "pokemob.move.sacred-fire": "せいなるほのお",
+  "pokemob.move.magnitude": "マグニチュード",
+  "pokemob.move.dynamic-punch": "ばくれつパンチ",
+  "pokemob.move.megahorn": "メガホーン",
+  "pokemob.move.dragon-breath": "りゅうのいぶき",
+  "pokemob.move.baton-pass": "バトンタッチ",
+  "pokemob.move.encore": "アンコール",
+  "pokemob.move.pursuit": "おいうち",
+  "pokemob.move.rapid-spin": "こうそくスピン",
+  "pokemob.move.sweet-scent": "あまいかおり",
+  "pokemob.move.iron-tail": "アイアンテール",
+  "pokemob.move.metal-claw": "メタルクロー",
+  "pokemob.move.vital-throw": "あてみなげ",
+  "pokemob.move.morning-sun": "あさのひざし",
+  "pokemob.move.synthesis": "こうごうせい",
+  "pokemob.move.moonlight": "つきのひかり",
+  "pokemob.move.hidden-power": "めざめるパワー",
+  "pokemob.move.cross-chop": "クロスチョップ",
+  "pokemob.move.twister": "たつまき",
+  "pokemob.move.rain-dance": "あまごい",
+  "pokemob.move.sunny-day": "にほんばれ",
+  "pokemob.move.crunch": "かみくだく",
+  "pokemob.move.mirror-coat": "ミラーコート",
+  "pokemob.move.psych-up": "じこあんじ",
+  "pokemob.move.extreme-speed": "しんそく",
+  "pokemob.move.ancient-power": "げんしのちから",
+  "pokemob.move.shadow-ball": "シャドーボール",
+  "pokemob.move.future-sight": "みらいよち",
+  "pokemob.move.rock-smash": "いわくだき",
+  "pokemob.move.whirlpool": "うずしお",
+  "pokemob.move.beat-up": "ふくろだたき",
+  "pokemob.move.fake-out": "ねこだまし",
+  "pokemob.move.uproar": "さわぐ",
+  "pokemob.move.stockpile": "たくわえる",
+  "pokemob.move.spit-up": "はきだす",
+  "pokemob.move.swallow": "のみこむ",
+  "pokemob.move.heat-wave": "ねっぷう",
+  "pokemob.move.hail": "あられ",
+  "pokemob.move.torment": "いちゃもん",
+  "pokemob.move.flatter": "おだてる",
+  "pokemob.move.will-o-wisp": "おにび",
+  "pokemob.move.memento": "おきみやげ",
+  "pokemob.move.facade": "からげんき",
+  "pokemob.move.focus-punch": "きあいパンチ",
+  "pokemob.move.smelling-salts": "きつけ",
+  "pokemob.move.follow-me": "このゆびとまれ",
+  "pokemob.move.nature-power": "しぜんのちから",
+  "pokemob.move.charge": "じゅうでん",
+  "pokemob.move.taunt": "ちょうはつ",
+  "pokemob.move.helping-hand": "てだすけ",
+  "pokemob.move.trick": "トリック",
+  "pokemob.move.role-play": "なりきり",
+  "pokemob.move.wish": "ねがいごと",
+  "pokemob.move.assist": "ねこのて",
+  "pokemob.move.ingrain": "ねをはる",
+  "pokemob.move.superpower": "ばかぢから",
+  "pokemob.move.magic-coat": "マジックコート",
+  "pokemob.move.recycle": "リサイクル",
+  "pokemob.move.revenge": "リベンジ",
+  "pokemob.move.brick-break": "かわらわり",
+  "pokemob.move.yawn": "あくび",
+  "pokemob.move.knock-off": "はたきおとす",
+  "pokemob.move.endeavor": "がむしゃら",
+  "pokemob.move.eruption": "ふんか",
+  "pokemob.move.skill-swap": "スキルスワップ",
+  "pokemob.move.imprison": "ふういん",
+  "pokemob.move.refresh": "リフレッシュ",
+  "pokemob.move.grudge": "おんねん",
+  "pokemob.move.snatch": "よこどり",
+  "pokemob.move.secret-power": "ひみつのちから",
+  "pokemob.move.dive": "ダイビング",
+  "pokemob.move.arm-thrust": "つっぱり",
+  "pokemob.move.camouflage": "ほごしょく",
+  "pokemob.move.tail-glow": "ほたるび",
+  "pokemob.move.luster-purge": "ラスターパージ",
+  "pokemob.move.mist-ball": "ミストボール",
+  "pokemob.move.feather-dance": "フェザーダンス",
+  "pokemob.move.teeter-dance": "フラフラダンス",
+  "pokemob.move.blaze-kick": "ブレイズキック",
+  "pokemob.move.mud-sport": "どろあそび",
+  "pokemob.move.ice-ball": "アイスボール",
+  "pokemob.move.needle-arm": "ニードルアーム",
+  "pokemob.move.slack-off": "なまける",
+  "pokemob.move.hyper-voice": "ハイパーボイス",
+  "pokemob.move.poison-fang": "どくどくのキバ",
+  "pokemob.move.crush-claw": "ブレイククロー",
+  "pokemob.move.blast-burn": "ブラストバーン",
+  "pokemob.move.hydro-cannon": "ハイドロカノン",
+  "pokemob.move.meteor-mash": "コメットパンチ",
+  "pokemob.move.astonish": "おどろかす",
+  "pokemob.move.weather-ball": "ウェザーボール",
+  "pokemob.move.aromatherapy": "アロマセラピー",
+  "pokemob.move.fake-tears": "うそなき",
+  "pokemob.move.air-cutter": "エアカッター",
+  "pokemob.move.overheat": "オーバーヒート",
+  "pokemob.move.odor-sleuth": "かぎわける",
+  "pokemob.move.rock-tomb": "がんせきふうじ",
+  "pokemob.move.silver-wind": "ぎんいろのかぜ",
+  "pokemob.move.metal-sound": "きんぞくおん",
+  "pokemob.move.grass-whistle": "くさぶえ",
+  "pokemob.move.tickle": "くすぐる",
+  "pokemob.move.cosmic-power": "コスモパワー",
+  "pokemob.move.water-spout": "しおふき",
+  "pokemob.move.signal-beam": "シグナルビーム",
+  "pokemob.move.shadow-punch": "シャドーパンチ",
+  "pokemob.move.extrasensory": "じんつうりき",
+  "pokemob.move.sky-uppercut": "スカイアッパー",
+  "pokemob.move.sand-tomb": "すなじごく",
+  "pokemob.move.sheer-cold": "ぜったいれいど",
+  "pokemob.move.muddy-water": "だくりゅう",
+  "pokemob.move.bullet-seed": "タネマシンガン",
+  "pokemob.move.aerial-ace": "つばめがえし",
+  "pokemob.move.icicle-spear": "つららばり",
+  "pokemob.move.iron-defense": "てっぺき",
+  "pokemob.move.block": "とおせんぼう",
+  "pokemob.move.howl": "とおぼえ",
+  "pokemob.move.dragon-claw": "ドラゴンクロー",
+  "pokemob.move.frenzy-plant": "ハードプラント",
+  "pokemob.move.bulk-up": "ビルドアップ",
+  "pokemob.move.bounce": "とびはねる",
+  "pokemob.move.mud-shot": "マッドショット",
+  "pokemob.move.poison-tail": "ポイズンテール",
+  "pokemob.move.covet": "ほしがる",
+  "pokemob.move.volt-tackle": "ボルテッカー",
+  "pokemob.move.magical-leaf": "マジカルリーフ",
+  "pokemob.move.water-sport": "みずあそび",
+  "pokemob.move.calm-mind": "めいそう",
+  "pokemob.move.leaf-blade": "リーフブレード",
+  "pokemob.move.dragon-dance": "りゅうのまい",
+  "pokemob.move.rock-blast": "ロックブラスト",
+  "pokemob.move.shock-wave": "でんげきは",
+  "pokemob.move.water-pulse": "みずのはどう",
+  "pokemob.move.doom-desire": "はめつのねがい",
+  "pokemob.move.psycho-boost": "サイコブースト",
+  "pokemob.move.roost": "はねやすめ",
+  "pokemob.move.gravity": "じゅうりょく",
+  "pokemob.move.miracle-eye": "ミラクルアイ",
+  "pokemob.move.wake-up-slap": "めざましビンタ",
+  "pokemob.move.hammer-arm": "アームハンマー",
+  "pokemob.move.gyro-ball": "ジャイロボール",
+  "pokemob.move.healing-wish": "いやしのねがい",
+  "pokemob.move.brine": "しおみず",
+  "pokemob.move.natural-gift": "しぜんのめぐみ",
+  "pokemob.move.feint": "フェイント",
+  "pokemob.move.pluck": "ついばむ",
+  "pokemob.move.tailwind": "おいかぜ",
+  "pokemob.move.acupressure": "つぼをつく",
+  "pokemob.move.metal-burst": "メタルバースト",
+  "pokemob.move.u-turn": "とんぼがえり",
+  "pokemob.move.close-combat": "インファイト",
+  "pokemob.move.payback": "しっぺがえし",
+  "pokemob.move.assurance": "ダメおし",
+  "pokemob.move.embargo": "さしおさえ",
+  "pokemob.move.fling": "なげつける",
+  "pokemob.move.psycho-shift": "サイコシフト",
+  "pokemob.move.trump-card": "きりふだ",
+  "pokemob.move.heal-block": "かいふくふうじ",
+  "pokemob.move.wring-out": "しぼりとる",
+  "pokemob.move.power-trick": "パワートリック",
+  "pokemob.move.gastro-acid": "いえき",
+  "pokemob.move.lucky-chant": "おまじない",
+  "pokemob.move.me-first": "さきどり",
+  "pokemob.move.copycat": "まねっこ",
+  "pokemob.move.power-swap": "パワースワップ",
+  "pokemob.move.guard-swap": "ガードスワップ",
+  "pokemob.move.punishment": "おしおき",
+  "pokemob.move.last-resort": "とっておき",
+  "pokemob.move.worry-seed": "なやみのタネ",
+  "pokemob.move.sucker-punch": "ふいうち",
+  "pokemob.move.toxic-spikes": "どくびし",
+  "pokemob.move.heart-swap": "ハートスワップ",
+  "pokemob.move.aqua-ring": "アクアリング",
+  "pokemob.move.magnet-rise": "でんじふゆう",
+  "pokemob.move.flare-blitz": "フレアドライブ",
+  "pokemob.move.force-palm": "はっけい",
+  "pokemob.move.aura-sphere": "はどうだん",
+  "pokemob.move.rock-polish": "ロックカット",
+  "pokemob.move.poison-jab": "どくづき",
+  "pokemob.move.dark-pulse": "あくのはどう",
+  "pokemob.move.night-slash": "つじぎり",
+  "pokemob.move.aqua-tail": "アクアテール",
+  "pokemob.move.seed-bomb": "タネばくだん",
+  "pokemob.move.air-slash": "エアスラッシュ",
+  "pokemob.move.x-scissor": "シザークロス",
+  "pokemob.move.bug-buzz": "むしのさざめき",
+  "pokemob.move.dragon-pulse": "りゅうのはどう",
+  "pokemob.move.dragon-rush": "ドラゴンダイブ",
+  "pokemob.move.power-gem": "パワージェム",
+  "pokemob.move.drain-punch": "ドレインパンチ",
+  "pokemob.move.vacuum-wave": "しんくうは",
+  "pokemob.move.focus-blast": "きあいだま",
+  "pokemob.move.energy-ball": "エナジーボール",
+  "pokemob.move.brave-bird": "ブレイブバード",
+  "pokemob.move.earth-power": "だいちのちから",
+  "pokemob.move.switcheroo": "すりかえ",
+  "pokemob.move.giga-impact": "ギガインパクト",
+  "pokemob.move.nasty-plot": "わるだくみ",
+  "pokemob.move.bullet-punch": "バレットパンチ",
+  "pokemob.move.avalanche": "ゆきなだれ",
+  "pokemob.move.ice-shard": "こおりのつぶて",
+  "pokemob.move.shadow-claw": "シャドークロー",
+  "pokemob.move.thunder-fang": "かみなりのキバ",
+  "pokemob.move.ice-fang": "こおりのキバ",
+  "pokemob.move.fire-fang": "ほのおのキバ",
+  "pokemob.move.shadow-sneak": "かげうち",
+  "pokemob.move.mud-bomb": "どろばくだん",
+  "pokemob.move.psycho-cut": "サイコカッター",
+  "pokemob.move.zen-headbutt": "しねんのずつき",
+  "pokemob.move.mirror-shot": "ミラーショット",
+  "pokemob.move.flash-cannon": "ラスターカノン",
+  "pokemob.move.rock-climb": "ロッククライム",
+  "pokemob.move.defog": "きりばらい",
+  "pokemob.move.trick-room": "トリックルーム",
+  "pokemob.move.draco-meteor": "りゅうせいぐん",
+  "pokemob.move.discharge": "ほうでん",
+  "pokemob.move.lava-plume": "ふんえん",
+  "pokemob.move.leaf-storm": "リーフストーム",
+  "pokemob.move.power-whip": "パワーウィップ",
+  "pokemob.move.rock-wrecker": "がんせきほう",
+  "pokemob.move.cross-poison": "クロスポイズン",
+  "pokemob.move.gunk-shot": "ダストシュート",
+  "pokemob.move.iron-head": "アイアンヘッド",
+  "pokemob.move.magnet-bomb": "マグネットボム",
+  "pokemob.move.stone-edge": "ストーンエッジ",
+  "pokemob.move.captivate": "ゆうわく",
+  "pokemob.move.stealth-rock": "ステルスロック",
+  "pokemob.move.grass-knot": "くさむすび",
+  "pokemob.move.chatter": "おしゃべり",
+  "pokemob.move.judgment": "さばきのつぶて",
+  "pokemob.move.bug-bite": "むしくい",
+  "pokemob.move.charge-beam": "チャージビーム",
+  "pokemob.move.wood-hammer": "ウッドハンマー",
+  "pokemob.move.aqua-jet": "アクアジェット",
+  "pokemob.move.attack-order": "こうげきしれい",
+  "pokemob.move.defend-order": "ぼうぎょしれい",
+  "pokemob.move.heal-order": "かいふくしれい",
+  "pokemob.move.head-smash": "もろはのずつき",
+  "pokemob.move.double-hit": "ダブルアタック",
+  "pokemob.move.roar-of-time": "ときのほうこう",
+  "pokemob.move.spacial-rend": "あくうせつだん",
+  "pokemob.move.lunar-dance": "みかづきのまい",
+  "pokemob.move.crush-grip": "にぎりつぶす",
+  "pokemob.move.magma-storm": "マグマストーム",
+  "pokemob.move.dark-void": "ダークホール",
+  "pokemob.move.seed-flare": "シードフレア",
+  "pokemob.move.ominous-wind": "あやしいかぜ",
+  "pokemob.move.shadow-force": "シャドーダイブ",
+  "pokemob.move.hone-claws": "つめとぎ",
+  "pokemob.move.wide-guard": "ワイドガード",
+  "pokemob.move.guard-split": "ガードシェア",
+  "pokemob.move.power-split": "パワーシェア",
+  "pokemob.move.wonder-room": "ワンダールーム",
+  "pokemob.move.psyshock": "サイコショック",
+  "pokemob.move.venoshock": "ベノムショック",
+  "pokemob.move.autotomize": "ボディパージ",
+  "pokemob.move.rage-powder": "いかりのこな",
+  "pokemob.move.telekinesis": "テレキネシス",
+  "pokemob.move.magic-room": "マジックルーム",
+  "pokemob.move.smack-down": "うちおとす",
+  "pokemob.move.storm-throw": "やまあらし",
+  "pokemob.move.flame-burst": "はじけるほのお",
+  "pokemob.move.sludge-wave": "ヘドロウェーブ",
+  "pokemob.move.quiver-dance": "ちょうのまい",
+  "pokemob.move.heavy-slam": "ヘビーボンバー",
+  "pokemob.move.synchronoise": "シンクロノイズ",
+  "pokemob.move.electro-ball": "エレキボール",
+  "pokemob.move.soak": "みずびたし",
+  "pokemob.move.flame-charge": "ニトロチャージ",
+  "pokemob.move.coil": "とぐろをまく",
+  "pokemob.move.low-sweep": "ローキック",
+  "pokemob.move.acid-spray": "アシッドボム",
+  "pokemob.move.foul-play": "イカサマ",
+  "pokemob.move.simple-beam": "シンプルビーム",
+  "pokemob.move.entrainment": "なかまづくり",
+  "pokemob.move.after-you": "おさきにどうぞ",
+  "pokemob.move.round": "りんしょう",
+  "pokemob.move.echoed-voice": "エコーボイス",
+  "pokemob.move.chip-away": "なしくずし",
+  "pokemob.move.clear-smog": "クリアスモッグ",
+  "pokemob.move.stored-power": "アシストパワー",
+  "pokemob.move.quick-guard": "ファストガード",
+  "pokemob.move.ally-switch": "サイドチェンジ",
+  "pokemob.move.scald": "ねっとう",
+  "pokemob.move.shell-smash": "からをやぶる",
+  "pokemob.move.heal-pulse": "いやしのはどう",
+  "pokemob.move.hex": "たたりめ",
+  "pokemob.move.sky-drop": "フリーフォール",
+  "pokemob.move.shift-gear": "ギアチェンジ",
+  "pokemob.move.circle-throw": "ともえなげ",
+  "pokemob.move.incinerate": "やきつくす",
+  "pokemob.move.quash": "さきおくり",
+  "pokemob.move.acrobatics": "アクロバット",
+  "pokemob.move.reflect-type": "ミラータイプ",
+  "pokemob.move.retaliate": "かたきうち",
+  "pokemob.move.final-gambit": "いのちがけ",
+  "pokemob.move.bestow": "ギフトパス",
+  "pokemob.move.inferno": "れんごく",
+  "pokemob.move.water-pledge": "みずのちかい",
+  "pokemob.move.fire-pledge": "ほのおのちかい",
+  "pokemob.move.grass-pledge": "くさのちかい",
+  "pokemob.move.volt-switch": "ボルトチェンジ",
+  "pokemob.move.struggle-bug": "むしのていこう",
+  "pokemob.move.bulldoze": "じならし",
+  "pokemob.move.frost-breath": "こおりのいぶき",
+  "pokemob.move.dragon-tail": "ドラゴンテール",
+  "pokemob.move.work-up": "ふるいたてる",
+  "pokemob.move.electroweb": "エレキネット",
+  "pokemob.move.wild-charge": "ワイルドボルト",
+  "pokemob.move.drill-run": "ドリルライナー",
+  "pokemob.move.dual-chop": "ダブルチョップ",
+  "pokemob.move.heart-stamp": "ハートスタンプ",
+  "pokemob.move.horn-leech": "ウッドホーン",
+  "pokemob.move.sacred-sword": "せいなるつるぎ",
+  "pokemob.move.razor-shell": "シェルブレード",
+  "pokemob.move.heat-crash": "ヒートスタンプ",
+  "pokemob.move.leaf-tornado": "グラスミキサー",
+  "pokemob.move.steamroller": "ハードローラー",
+  "pokemob.move.cotton-guard": "コットンガード",
+  "pokemob.move.night-daze": "ナイトバースト",
+  "pokemob.move.psystrike": "サイコブレイク",
+  "pokemob.move.tail-slap": "スイープビンタ",
+  "pokemob.move.hurricane": "ぼうふう",
+  "pokemob.move.head-charge": "アフロブレイク",
+  "pokemob.move.gear-grind": "ギアソーサー",
+  "pokemob.move.searing-shot": "かえんだん",
+  "pokemob.move.techno-blast": "テクノバスター",
+  "pokemob.move.relic-song": "いにしえのうた",
+  "pokemob.move.secret-sword": "しんぴのつるぎ",
+  "pokemob.move.glaciate": "こごえるせかい",
+  "pokemob.move.bolt-strike": "らいげき",
+  "pokemob.move.blue-flare": "あおいほのお",
+  "pokemob.move.fiery-dance": "ほのおのまい",
+  "pokemob.move.freeze-shock": "フリーズボルト",
+  "pokemob.move.ice-burn": "コールドフレア",
+  "pokemob.move.snarl": "バークアウト",
+  "pokemob.move.icicle-crash": "つららおとし",
+  "pokemob.move.v-create": "Ｖジェネレート",
+  "pokemob.move.fusion-flare": "クロスフレイム",
+  "pokemob.move.fusion-bolt": "クロスサンダー",
+  "pokemob.move.flying-press": "フライングプレス",
+  "pokemob.move.mat-block": "たたみがえし",
+  "pokemob.move.belch": "ゲップ",
+  "pokemob.move.rototiller": "たがやす",
+  "pokemob.move.sticky-web": "ねばねばネット",
+  "pokemob.move.fell-stinger": "とどめばり",
+  "pokemob.move.phantom-force": "ゴーストダイブ",
+  "pokemob.move.trick-or-treat": "ハロウィン",
+  "pokemob.move.noble-roar": "おたけび",
+  "pokemob.move.ion-deluge": "プラズマシャワー",
+  "pokemob.move.parabolic-charge": "パラボラチャージ",
+  "pokemob.move.forests-curse": "もりののろい",
+  "pokemob.move.petal-blizzard": "はなふぶき",
+  "pokemob.move.freeze-dry": "フリーズドライ",
+  "pokemob.move.disarming-voice": "チャームボイス",
+  "pokemob.move.parting-shot": "すてゼリフ",
+  "pokemob.move.topsy-turvy": "ひっくりかえす",
+  "pokemob.move.draining-kiss": "ドレインキッス",
+  "pokemob.move.crafty-shield": "トリックガード",
+  "pokemob.move.flower-shield": "フラワーガード",
+  "pokemob.move.grassy-terrain": "グラスフィールド",
+  "pokemob.move.misty-terrain": "ミストフィールド",
+  "pokemob.move.electrify": "そうでん",
+  "pokemob.move.play-rough": "じゃれつく",
+  "pokemob.move.fairy-wind": "ようせいのかぜ",
+  "pokemob.move.moonblast": "ムーンフォース",
+  "pokemob.move.boomburst": "ばくおんぱ",
+  "pokemob.move.fairy-lock": "フェアリーロック",
+  "pokemob.move.kings-shield": "キングシールド",
+  "pokemob.move.play-nice": "なかよくする",
+  "pokemob.move.confide": "ないしょばなし",
+  "pokemob.move.diamond-storm": "ダイヤストーム",
+  "pokemob.move.steam-eruption": "スチームバースト",
+  "pokemob.move.hyperspace-hole": "いじげんホール",
+  "pokemob.move.water-shuriken": "みずしゅりけん",
+  "pokemob.move.mystical-fire": "マジカルフレイム",
+  "pokemob.move.spiky-shield": "ニードルガード",
+  "pokemob.move.aromatic-mist": "アロマミスト",
+  "pokemob.move.eerie-impulse": "かいでんぱ",
+  "pokemob.move.venom-drench": "ベノムトラップ",
+  "pokemob.move.powder": "ふんじん",
+  "pokemob.move.geomancy": "ジオコントロール",
+  "pokemob.move.magnetic-flux": "じばそうさ",
+  "pokemob.move.happy-hour": "ハッピータイム",
+  "pokemob.move.electric-terrain": "エレキフィールド",
+  "pokemob.move.dazzling-gleam": "マジカルシャイン",
+  "pokemob.move.celebrate": "おいわい",
+  "pokemob.move.hold-hands": "てをつなぐ",
+  "pokemob.move.baby-doll-eyes": "つぶらなひとみ",
+  "pokemob.move.nuzzle": "ほっぺすりすり",
+  "pokemob.move.hold-back": "てかげん",
+  "pokemob.move.infestation": "まとわりつく",
+  "pokemob.move.power-up-punch": "グロウパンチ",
+  "pokemob.move.oblivion-wing": "デスウイング",
+  "pokemob.move.thousand-arrows": "サウザンアロー",
+  "pokemob.move.thousand-waves": "サウザンウェーブ",
+  "pokemob.move.lands-wrath": "グランドフォース",
+  "pokemob.move.light-of-ruin": "はめつのひかり",
+  "pokemob.move.origin-pulse": "こんげんのはどう",
+  "pokemob.move.precipice-blades": "だんがいのつるぎ",
+  "pokemob.move.dragon-ascent": "ガリョウテンセイ",
+  "pokemob.move.hyperspace-fury": "いじげんラッシュ",
+  "pokemob.move.breakneck-blitz--physical": "ウルトラダッシュアタック",
+  "pokemob.move.breakneck-blitz--special": "ウルトラダッシュアタック",
+  "pokemob.move.all-out-pummeling--physical": "ぜんりょくむそうげきれつけん",
+  "pokemob.move.all-out-pummeling--special": "ぜんりょくむそうげきれつけん",
+  "pokemob.move.supersonic-skystrike--physical": "ファイナルダイブクラッシュ",
+  "pokemob.move.supersonic-skystrike--special": "ファイナルダイブクラッシュ",
+  "pokemob.move.acid-downpour--physical": "アシッドポイズンデリート",
+  "pokemob.move.acid-downpour--special": "アシッドポイズンデリート",
+  "pokemob.move.tectonic-rage--physical": "ライジングランドオーバー",
+  "pokemob.move.tectonic-rage--special": "ライジングランドオーバー",
+  "pokemob.move.continental-crush--physical": "ワールズエンドフォール",
+  "pokemob.move.continental-crush--special": "ワールズエンドフォール",
+  "pokemob.move.savage-spin-out--physical": "ぜったいほしょくかいてんざん",
+  "pokemob.move.savage-spin-out--special": "ぜったいほしょくかいてんざん",
+  "pokemob.move.never-ending-nightmare--physical": "むげんあんやへのいざない",
+  "pokemob.move.never-ending-nightmare--special": "むげんあんやへのいざない",
+  "pokemob.move.corkscrew-crash--physical": "ちょうぜつらせんれんげき",
+  "pokemob.move.corkscrew-crash--special": "ちょうぜつらせんれんげき",
+  "pokemob.move.inferno-overdrive--physical": "ダイナミックフルフレイム",
+  "pokemob.move.inferno-overdrive--special": "ダイナミックフルフレイム",
+  "pokemob.move.hydro-vortex--physical": "スーパーアクアトルネード",
+  "pokemob.move.hydro-vortex--special": "スーパーアクアトルネード",
+  "pokemob.move.bloom-doom--physical": "ブルームシャインエクストラ",
+  "pokemob.move.bloom-doom--special": "ブルームシャインエクストラ",
+  "pokemob.move.gigavolt-havoc--physical": "スパーキングギガボルト",
+  "pokemob.move.gigavolt-havoc--special": "スパーキングギガボルト",
+  "pokemob.move.shattered-psyche--physical": "マキシマムサイブレイカー",
+  "pokemob.move.shattered-psyche--special": "マキシマムサイブレイカー",
+  "pokemob.move.subzero-slammer--physical": "レイジングジオフリーズ",
+  "pokemob.move.subzero-slammer--special": "レイジングジオフリーズ",
+  "pokemob.move.devastating-drake--physical": "アルティメットドラゴンバーン",
+  "pokemob.move.devastating-drake--special": "アルティメットドラゴンバーン",
+  "pokemob.move.black-hole-eclipse--physical": "ブラックホールイクリプス",
+  "pokemob.move.black-hole-eclipse--special": "ブラックホールイクリプス",
+  "pokemob.move.twinkle-tackle--physical": "ラブリースターインパクト",
+  "pokemob.move.twinkle-tackle--special": "ラブリースターインパクト",
+  "pokemob.move.catastropika": "ひっさつのピカチュート",
+  "pokemob.move.shore-up": "すなあつめ",
+  "pokemob.move.first-impression": "であいがしら",
+  "pokemob.move.baneful-bunker": "トーチカ",
+  "pokemob.move.spirit-shackle": "かげぬい",
+  "pokemob.move.darkest-lariat": "ＤＤラリアット",
+  "pokemob.move.sparkling-aria": "うたかたのアリア",
+  "pokemob.move.ice-hammer": "アイスハンマー",
+  "pokemob.move.floral-healing": "フラワーヒール",
+  "pokemob.move.high-horsepower": "１０まんばりき",
+  "pokemob.move.strength-sap": "ちからをすいとる",
+  "pokemob.move.solar-blade": "ソーラーブレード",
+  "pokemob.move.leafage": "このは",
+  "pokemob.move.spotlight": "スポットライト",
+  "pokemob.move.toxic-thread": "どくのいと",
+  "pokemob.move.laser-focus": "とぎすます",
+  "pokemob.move.gear-up": "アシストギア",
+  "pokemob.move.throat-chop": "じごくづき",
+  "pokemob.move.pollen-puff": "かふんだんご",
+  "pokemob.move.anchor-shot": "アンカーショット",
+  "pokemob.move.psychic-terrain": "サイコフィールド",
+  "pokemob.move.lunge": "とびかかる",
+  "pokemob.move.fire-lash": "ほのおのムチ",
+  "pokemob.move.power-trip": "つけあがる",
+  "pokemob.move.burn-up": "もえつきる",
+  "pokemob.move.speed-swap": "スピードスワップ",
+  "pokemob.move.smart-strike": "スマートホーン",
+  "pokemob.move.purify": "じょうか",
+  "pokemob.move.revelation-dance": "めざめるダンス",
+  "pokemob.move.core-enforcer": "コアパニッシャー",
+  "pokemob.move.trop-kick": "トロピカルキック",
+  "pokemob.move.instruct": "さいはい",
+  "pokemob.move.beak-blast": "くちばしキャノン",
+  "pokemob.move.clanging-scales": "スケイルノイズ",
+  "pokemob.move.dragon-hammer": "ドラゴンハンマー",
+  "pokemob.move.brutal-swing": "ぶんまわす",
+  "pokemob.move.aurora-veil": "オーロラベール",
+  "pokemob.move.sinister-arrow-raid": "シャドーアローズストライク",
+  "pokemob.move.malicious-moonsault": "ハイパーダーククラッシャー",
+  "pokemob.move.oceanic-operetta": "わだつみのシンフォニア",
+  "pokemob.move.guardian-of-alola": "ガーディアン・デ・アローラ",
+  "pokemob.move.soul-stealing-7-star-strike": "しちせいだっこんたい",
+  "pokemob.move.stoked-sparksurfer": "ライトニングサーフライド",
+  "pokemob.move.pulverizing-pancake": "ほんきをだす　こうげき",
+  "pokemob.move.extreme-evoboost": "ナインエボルブースト",
+  "pokemob.move.genesis-supernova": "オリジンズスーパーノヴァ",
+  "pokemob.move.shell-trap": "トラップシェル",
+  "pokemob.move.fleur-cannon": "フルールカノン",
+  "pokemob.move.psychic-fangs": "サイコファング",
+  "pokemob.move.stomping-tantrum": "じだんだ",
+  "pokemob.move.shadow-bone": "シャドーボーン",
+  "pokemob.move.accelerock": "アクセルロック",
+  "pokemob.move.liquidation": "アクアブレイク",
+  "pokemob.move.prismatic-laser": "プリズムレーザー",
+  "pokemob.move.spectral-thief": "シャドースチール",
+  "pokemob.move.sunsteel-strike": "メテオドライブ",
+  "pokemob.move.moongeist-beam": "シャドーレイ",
+  "pokemob.move.tearful-look": "なみだめ",
+  "pokemob.move.zing-zap": "びりびりちくちく",
+  "pokemob.move.natures-madness": "しぜんのいかり",
+  "pokemob.move.multi-attack": "マルチアタック",
+  "pokemob.move.10-000-000-volt-thunderbolt": "１０００まんボルト",
+  "pokemob.move.mind-blown": "ビックリヘッド",
+  "pokemob.move.plasma-fists": "プラズマフィスト",
+  "pokemob.move.photon-geyser": "フォトンゲイザー",
+  "pokemob.move.light-that-burns-the-sky": "てんこがすめつぼうのひかり",
+  "pokemob.move.searing-sunraze-smash": "サンシャインスマッシャー",
+  "pokemob.move.menacing-moonraze-maelstrom": "ムーンライトブラスター",
+  "pokemob.move.lets-snuggle-forever": "ぽかぼかフレンドタイム",
+  "pokemob.move.splintered-stormshards": "ラジアルエッジストーム",
+  "pokemob.move.clangorous-soulblaze": "ブレイジングソウルビート",
+  "pokemob.move.zippy-zap": "ばちばちアクセル",
+  "pokemob.move.splishy-splash": "ざぶざぶサーフ",
+  "pokemob.move.floaty-fall": "ふわふわフォール",
+  "pokemob.move.pika-papow": "ピカピカサンダー",
+  "pokemob.move.bouncy-bubble": "いきいきバブル",
+  "pokemob.move.buzzy-buzz": "びりびりエレキ",
+  "pokemob.move.sizzly-slide": "めらめらバーン",
+  "pokemob.move.glitzy-glow": "どばどばオーラ",
+  "pokemob.move.baddy-bad": "わるわるゾーン",
+  "pokemob.move.sappy-seed": "すくすくボンバー",
+  "pokemob.move.freezy-frost": "こちこちフロスト",
+  "pokemob.move.sparkly-swirl": "きらきらストーム",
+  "pokemob.move.veevee-volley": "ブイブイブレイク",
+  "pokemob.move.double-iron-bash": "ダブルパンツァー",
+  "pokemob.move.max-guard": "ダイウォール",
+  "pokemob.move.dynamax-cannon": "ダイマックスほう",
+  "pokemob.move.snipe-shot": "ねらいうち",
+  "pokemob.move.jaw-lock": "くらいつく",
+  "pokemob.move.stuff-cheeks": "ほおばる",
+  "pokemob.move.no-retreat": "はいすいのじん",
+  "pokemob.move.tar-shot": "タールショット",
+  "pokemob.move.magic-powder": "まほうのこな",
+  "pokemob.move.dragon-darts": "ドラゴンアロー",
+  "pokemob.move.teatime": "おちゃかい",
+  "pokemob.move.octolock": "たこがため",
+  "pokemob.move.bolt-beak": "でんげきくちばし",
+  "pokemob.move.fishious-rend": "エラがみ",
+  "pokemob.move.court-change": "コートチェンジ",
+  "pokemob.move.max-flare": "ダイバーン",
+  "pokemob.move.max-flutterby": "ダイワーム",
+  "pokemob.move.max-lightning": "ダイサンダー",
+  "pokemob.move.max-strike": "ダイアタック",
+  "pokemob.move.max-knuckle": "ダイナックル",
+  "pokemob.move.max-phantasm": "ダイホロウ",
+  "pokemob.move.max-hailstorm": "ダイアイス",
+  "pokemob.move.max-ooze": "ダイアシッド",
+  "pokemob.move.max-geyser": "ダイストリーム",
+  "pokemob.move.max-airstream": "ダイジェット",
+  "pokemob.move.max-starfall": "ダイフェアリー",
+  "pokemob.move.max-wyrmwind": "ダイドラグーン",
+  "pokemob.move.max-mindstorm": "ダイサイコ",
+  "pokemob.move.max-rockfall": "ダイロック",
+  "pokemob.move.max-quake": "ダイアース",
+  "pokemob.move.max-darkness": "ダイアーク",
+  "pokemob.move.max-overgrowth": "ダイソウゲン",
+  "pokemob.move.max-steelspike": "ダイスチル",
+  "pokemob.move.clangorous-soul": "ソウルビート",
+  "pokemob.move.body-press": "ボディプレス",
+  "pokemob.move.decorate": "デコレーション",
+  "pokemob.move.drum-beating": "ドラムアタック",
+  "pokemob.move.snap-trap": "トラバサミ",
+  "pokemob.move.pyro-ball": "かえんボール",
+  "pokemob.move.behemoth-blade": "きょじゅうざん",
+  "pokemob.move.behemoth-bash": "きょじゅうだん",
+  "pokemob.move.aura-wheel": "オーラぐるま",
+  "pokemob.move.breaking-swipe": "ワイドブレイカー",
+  "pokemob.move.branch-poke": "えだづき",
+  "pokemob.move.overdrive": "オーバードライブ",
+  "pokemob.move.apple-acid": "りんごさん",
+  "pokemob.move.grav-apple": "Ｇのちから",
+  "pokemob.move.spirit-break": "ソウルクラッシュ",
+  "pokemob.move.strange-steam": "ワンダースチーム",
+  "pokemob.move.life-dew": "いのちのしずく",
+  "pokemob.move.obstruct": "ブロッキング",
+  "pokemob.move.false-surrender": "どげざつき",
+  "pokemob.move.meteor-assault": "スターアサルト",
+  "pokemob.move.eternabeam": "ムゲンダイビーム",
+  "pokemob.move.steel-beam": "てっていこうせん",
+  "pokemob.move.expanding-force": "ワイドフォース",
+  "pokemob.move.steel-roller": "アイアンローラー",
+  "pokemob.move.scale-shot": "スケイルショット",
+  "pokemob.move.meteor-beam": "メテオビーム",
+  "pokemob.move.shell-side-arm": "シェルアームズ",
+  "pokemob.move.misty-explosion": "ミストバースト",
+  "pokemob.move.grassy-glide": "グラススライダー",
+  "pokemob.move.rising-voltage": "ライジングボルト",
+  "pokemob.move.terrain-pulse": "だいちのはどう",
+  "pokemob.move.skitter-smack": "はいよるいちげき",
+  "pokemob.move.burning-jealousy": "しっとのほのお",
+  "pokemob.move.lash-out": "うっぷんばらし",
+  "pokemob.move.poltergeist": "ポルターガイスト",
+  "pokemob.move.corrosive-gas": "ふしょくガス",
+  "pokemob.move.coaching": "コーチング",
+  "pokemob.move.flip-turn": "クイックターン",
+  "pokemob.move.triple-axel": "トリプルアクセル",
+  "pokemob.move.dual-wingbeat": "ダブルウイング",
+  "pokemob.move.scorching-sands": "ねっさのだいち",
+  "pokemob.move.jungle-healing": "ジャングルヒール",
+  "pokemob.move.wicked-blow": "あんこくきょうだ",
+  "pokemob.move.surging-strikes": "すいりゅうれんだ",
+  "pokemob.move.thunder-cage": "サンダープリズン",
+  "pokemob.move.dragon-energy": "ドラゴンエナジー",
+  "pokemob.move.freezing-glare": "いてつくしせん",
+  "pokemob.move.fiery-wrath": "もえあがるいかり",
+  "pokemob.move.thunderous-kick": "らいめいげり",
+  "pokemob.move.glacial-lance": "ブリザードランス",
+  "pokemob.move.astral-barrage": "アストラルビット",
+  "pokemob.move.eerie-spell": "ぶきみなじゅもん",
+  "pokemob.move.shadow-rush": "ダークラッシュ",
+  "pokemob.move.shadow-blast": "ダークブラスト",
+  "pokemob.move.shadow-blitz": "ダークアタック",
+  "pokemob.move.shadow-bolt": "ダークサンダー",
+  "pokemob.move.shadow-break": "ダークブレイク",
+  "pokemob.move.shadow-chill": "ダークフリーズ",
+  "pokemob.move.shadow-end": "ダークエンド",
+  "pokemob.move.shadow-fire": "ダークファイア",
+  "pokemob.move.shadow-rave": "ダークレイブ",
+  "pokemob.move.shadow-storm": "ダークストーム",
+  "pokemob.move.shadow-wave": "ダークウェーブ",
+  "pokemob.move.shadow-down": "ダークダウン",
+  "pokemob.move.shadow-half": "ダークハーフ",
+  "pokemob.move.shadow-hold": "ダークホールド",
+  "pokemob.move.shadow-mist": "ダークミスト",
+  "pokemob.move.shadow-panic": "ダークパニック",
+  "pokemob.move.shadow-shed": "ダークリムーブ",
+  "pokemob.move.shadow-sky": "ダークウェザー"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/ko_kr.json b/src/main/resources/assets/pokecube_moves/lang/ko_kr.json
new file mode 100644
index 0000000000..61012f032b
--- /dev/null
+++ b/src/main/resources/assets/pokecube_moves/lang/ko_kr.json
@@ -0,0 +1,828 @@
+{
+  "pokemob.move.pound": "막치기",
+  "pokemob.move.karate-chop": "태권당수",
+  "pokemob.move.double-slap": "연속뺨치기",
+  "pokemob.move.comet-punch": "연속펀치",
+  "pokemob.move.mega-punch": "메가톤펀치",
+  "pokemob.move.pay-day": "고양이돈받기",
+  "pokemob.move.fire-punch": "불꽃펀치",
+  "pokemob.move.ice-punch": "냉동펀치",
+  "pokemob.move.thunder-punch": "번개펀치",
+  "pokemob.move.scratch": "할퀴기",
+  "pokemob.move.vice-grip": "찝기",
+  "pokemob.move.guillotine": "가위자르기",
+  "pokemob.move.razor-wind": "칼바람",
+  "pokemob.move.swords-dance": "칼춤",
+  "pokemob.move.cut": "풀베기",
+  "pokemob.move.gust": "바람일으키기",
+  "pokemob.move.wing-attack": "날개치기",
+  "pokemob.move.whirlwind": "날려버리기",
+  "pokemob.move.fly": "공중날기",
+  "pokemob.move.bind": "조이기",
+  "pokemob.move.slam": "힘껏치기",
+  "pokemob.move.vine-whip": "덩굴채찍",
+  "pokemob.move.stomp": "짓밟기",
+  "pokemob.move.double-kick": "두번치기",
+  "pokemob.move.mega-kick": "메가톤킥",
+  "pokemob.move.jump-kick": "점프킥",
+  "pokemob.move.rolling-kick": "돌려차기",
+  "pokemob.move.sand-attack": "모래뿌리기",
+  "pokemob.move.headbutt": "박치기",
+  "pokemob.move.horn-attack": "뿔찌르기",
+  "pokemob.move.fury-attack": "마구찌르기",
+  "pokemob.move.horn-drill": "뿔드릴",
+  "pokemob.move.tackle": "몸통박치기",
+  "pokemob.move.body-slam": "누르기",
+  "pokemob.move.wrap": "김밥말이",
+  "pokemob.move.take-down": "돌진",
+  "pokemob.move.thrash": "난동부리기",
+  "pokemob.move.double-edge": "이판사판태클",
+  "pokemob.move.tail-whip": "꼬리흔들기",
+  "pokemob.move.poison-sting": "독침",
+  "pokemob.move.twineedle": "더블니들",
+  "pokemob.move.pin-missile": "바늘미사일",
+  "pokemob.move.leer": "째려보기",
+  "pokemob.move.bite": "물기",
+  "pokemob.move.growl": "울음소리",
+  "pokemob.move.roar": "울부짖기",
+  "pokemob.move.sing": "노래하기",
+  "pokemob.move.supersonic": "초음파",
+  "pokemob.move.sonic-boom": "소닉붐",
+  "pokemob.move.disable": "사슬묶기",
+  "pokemob.move.acid": "용해액",
+  "pokemob.move.ember": "불꽃세례",
+  "pokemob.move.flamethrower": "화염방사",
+  "pokemob.move.mist": "흰안개",
+  "pokemob.move.water-gun": "물대포",
+  "pokemob.move.hydro-pump": "하이드로펌프",
+  "pokemob.move.surf": "파도타기",
+  "pokemob.move.ice-beam": "냉동빔",
+  "pokemob.move.blizzard": "눈보라",
+  "pokemob.move.psybeam": "환상빔",
+  "pokemob.move.bubble-beam": "거품광선",
+  "pokemob.move.aurora-beam": "오로라빔",
+  "pokemob.move.hyper-beam": "파괴광선",
+  "pokemob.move.peck": "쪼기",
+  "pokemob.move.drill-peck": "회전부리",
+  "pokemob.move.submission": "지옥의바퀴",
+  "pokemob.move.low-kick": "안다리걸기",
+  "pokemob.move.counter": "카운터",
+  "pokemob.move.seismic-toss": "지구던지기",
+  "pokemob.move.strength": "괴력",
+  "pokemob.move.absorb": "흡수",
+  "pokemob.move.mega-drain": "메가드레인",
+  "pokemob.move.leech-seed": "씨뿌리기",
+  "pokemob.move.growth": "성장",
+  "pokemob.move.razor-leaf": "잎날가르기",
+  "pokemob.move.solar-beam": "솔라빔",
+  "pokemob.move.poison-powder": "독가루",
+  "pokemob.move.stun-spore": "저리가루",
+  "pokemob.move.sleep-powder": "수면가루",
+  "pokemob.move.petal-dance": "꽃잎댄스",
+  "pokemob.move.string-shot": "실뿜기",
+  "pokemob.move.dragon-rage": "용의분노",
+  "pokemob.move.fire-spin": "회오리불꽃",
+  "pokemob.move.thunder-shock": "전기쇼크",
+  "pokemob.move.thunderbolt": "10만볼트",
+  "pokemob.move.thunder-wave": "전기자석파",
+  "pokemob.move.thunder": "번개",
+  "pokemob.move.rock-throw": "돌떨구기",
+  "pokemob.move.earthquake": "지진",
+  "pokemob.move.fissure": "땅가르기",
+  "pokemob.move.dig": "구멍파기",
+  "pokemob.move.toxic": "맹독",
+  "pokemob.move.confusion": "염동력",
+  "pokemob.move.psychic": "사이코키네시스",
+  "pokemob.move.hypnosis": "최면술",
+  "pokemob.move.meditate": "요가포즈",
+  "pokemob.move.agility": "고속이동",
+  "pokemob.move.quick-attack": "전광석화",
+  "pokemob.move.rage": "분노",
+  "pokemob.move.teleport": "순간이동",
+  "pokemob.move.night-shade": "나이트헤드",
+  "pokemob.move.mimic": "흉내내기",
+  "pokemob.move.screech": "싫은소리",
+  "pokemob.move.double-team": "그림자분신",
+  "pokemob.move.recover": "HP회복",
+  "pokemob.move.harden": "단단해지기",
+  "pokemob.move.minimize": "작아지기",
+  "pokemob.move.smokescreen": "연막",
+  "pokemob.move.confuse-ray": "이상한빛",
+  "pokemob.move.withdraw": "껍질에숨기",
+  "pokemob.move.defense-curl": "웅크리기",
+  "pokemob.move.barrier": "배리어",
+  "pokemob.move.light-screen": "빛의장막",
+  "pokemob.move.haze": "흑안개",
+  "pokemob.move.reflect": "리플렉터",
+  "pokemob.move.focus-energy": "기충전",
+  "pokemob.move.bide": "참기",
+  "pokemob.move.metronome": "손가락흔들기",
+  "pokemob.move.mirror-move": "따라하기",
+  "pokemob.move.self-destruct": "자폭",
+  "pokemob.move.egg-bomb": "알폭탄",
+  "pokemob.move.lick": "핥기",
+  "pokemob.move.smog": "스모그",
+  "pokemob.move.sludge": "오물공격",
+  "pokemob.move.bone-club": "뼈다귀치기",
+  "pokemob.move.fire-blast": "불대문자",
+  "pokemob.move.waterfall": "폭포오르기",
+  "pokemob.move.clamp": "껍질끼우기",
+  "pokemob.move.swift": "스피드스타",
+  "pokemob.move.skull-bash": "로케트박치기",
+  "pokemob.move.spike-cannon": "가시대포",
+  "pokemob.move.constrict": "휘감기",
+  "pokemob.move.amnesia": "망각술",
+  "pokemob.move.kinesis": "숟가락휘기",
+  "pokemob.move.soft-boiled": "알낳기",
+  "pokemob.move.high-jump-kick": "무릎차기",
+  "pokemob.move.glare": "뱀눈초리",
+  "pokemob.move.dream-eater": "꿈먹기",
+  "pokemob.move.poison-gas": "독가스",
+  "pokemob.move.barrage": "구슬던지기",
+  "pokemob.move.leech-life": "흡혈",
+  "pokemob.move.lovely-kiss": "악마의키스",
+  "pokemob.move.sky-attack": "불새",
+  "pokemob.move.transform": "변신",
+  "pokemob.move.bubble": "거품",
+  "pokemob.move.dizzy-punch": "잼잼펀치",
+  "pokemob.move.spore": "버섯포자",
+  "pokemob.move.flash": "플래시",
+  "pokemob.move.psywave": "사이코웨이브",
+  "pokemob.move.splash": "튀어오르기",
+  "pokemob.move.acid-armor": "녹기",
+  "pokemob.move.crabhammer": "찝게햄머",
+  "pokemob.move.explosion": "대폭발",
+  "pokemob.move.fury-swipes": "마구할퀴기",
+  "pokemob.move.bonemerang": "뼈다귀부메랑",
+  "pokemob.move.rest": "잠자기",
+  "pokemob.move.rock-slide": "스톤샤워",
+  "pokemob.move.hyper-fang": "필살앞니",
+  "pokemob.move.sharpen": "각지기",
+  "pokemob.move.conversion": "텍스처",
+  "pokemob.move.tri-attack": "트라이어택",
+  "pokemob.move.super-fang": "분노의앞니",
+  "pokemob.move.slash": "베어가르기",
+  "pokemob.move.substitute": "대타출동",
+  "pokemob.move.struggle": "발버둥",
+  "pokemob.move.sketch": "스케치",
+  "pokemob.move.triple-kick": "트리플킥",
+  "pokemob.move.thief": "도둑질",
+  "pokemob.move.spider-web": "거미집",
+  "pokemob.move.mind-reader": "마음의눈",
+  "pokemob.move.nightmare": "악몽",
+  "pokemob.move.flame-wheel": "화염자동차",
+  "pokemob.move.snore": "코골기",
+  "pokemob.move.curse": "저주",
+  "pokemob.move.flail": "바둥바둥",
+  "pokemob.move.conversion-2": "텍스처2",
+  "pokemob.move.aeroblast": "에어로블라스트",
+  "pokemob.move.cotton-spore": "목화포자",
+  "pokemob.move.reversal": "기사회생",
+  "pokemob.move.spite": "원한",
+  "pokemob.move.powder-snow": "눈싸라기",
+  "pokemob.move.protect": "방어",
+  "pokemob.move.mach-punch": "마하펀치",
+  "pokemob.move.scary-face": "겁나는얼굴",
+  "pokemob.move.feint-attack": "속여때리기",
+  "pokemob.move.sweet-kiss": "천사의키스",
+  "pokemob.move.belly-drum": "배북",
+  "pokemob.move.sludge-bomb": "오물폭탄",
+  "pokemob.move.mud-slap": "진흙뿌리기",
+  "pokemob.move.octazooka": "대포무노포",
+  "pokemob.move.spikes": "압정뿌리기",
+  "pokemob.move.zap-cannon": "전자포",
+  "pokemob.move.foresight": "꿰뚫어보기",
+  "pokemob.move.destiny-bond": "길동무",
+  "pokemob.move.perish-song": "멸망의노래",
+  "pokemob.move.icy-wind": "얼다바람",
+  "pokemob.move.detect": "판별",
+  "pokemob.move.bone-rush": "본러쉬",
+  "pokemob.move.lock-on": "록온",
+  "pokemob.move.outrage": "역린",
+  "pokemob.move.sandstorm": "모래바람",
+  "pokemob.move.giga-drain": "기가드레인",
+  "pokemob.move.endure": "버티기",
+  "pokemob.move.charm": "애교부리기",
+  "pokemob.move.rollout": "구르기",
+  "pokemob.move.false-swipe": "칼등치기",
+  "pokemob.move.swagger": "뽐내기",
+  "pokemob.move.milk-drink": "우유마시기",
+  "pokemob.move.spark": "스파크",
+  "pokemob.move.fury-cutter": "연속자르기",
+  "pokemob.move.steel-wing": "강철날개",
+  "pokemob.move.mean-look": "검은눈빛",
+  "pokemob.move.attract": "헤롱헤롱",
+  "pokemob.move.sleep-talk": "잠꼬대",
+  "pokemob.move.heal-bell": "치료방울",
+  "pokemob.move.return": "은혜갚기",
+  "pokemob.move.present": "프레젠트",
+  "pokemob.move.frustration": "화풀이",
+  "pokemob.move.safeguard": "신비의부적",
+  "pokemob.move.pain-split": "아픔나누기",
+  "pokemob.move.sacred-fire": "성스러운불꽃",
+  "pokemob.move.magnitude": "매그니튜드",
+  "pokemob.move.dynamic-punch": "폭발펀치",
+  "pokemob.move.megahorn": "메가폰",
+  "pokemob.move.dragon-breath": "용의숨결",
+  "pokemob.move.baton-pass": "바톤터치",
+  "pokemob.move.encore": "앵콜",
+  "pokemob.move.pursuit": "따라가때리기",
+  "pokemob.move.rapid-spin": "고속스핀",
+  "pokemob.move.sweet-scent": "달콤한향기",
+  "pokemob.move.iron-tail": "아이언테일",
+  "pokemob.move.metal-claw": "메탈크로우",
+  "pokemob.move.vital-throw": "받아던지기",
+  "pokemob.move.morning-sun": "아침햇살",
+  "pokemob.move.synthesis": "광합성",
+  "pokemob.move.moonlight": "달의불빛",
+  "pokemob.move.hidden-power": "잠재파워",
+  "pokemob.move.cross-chop": "크로스촙",
+  "pokemob.move.twister": "회오리",
+  "pokemob.move.rain-dance": "비바라기",
+  "pokemob.move.sunny-day": "쾌청",
+  "pokemob.move.crunch": "깨물어부수기",
+  "pokemob.move.mirror-coat": "미러코트",
+  "pokemob.move.psych-up": "자기암시",
+  "pokemob.move.extreme-speed": "신속",
+  "pokemob.move.ancient-power": "원시의힘",
+  "pokemob.move.shadow-ball": "섀도볼",
+  "pokemob.move.future-sight": "미래예지",
+  "pokemob.move.rock-smash": "바위깨기",
+  "pokemob.move.whirlpool": "바다회오리",
+  "pokemob.move.beat-up": "집단구타",
+  "pokemob.move.fake-out": "속이다",
+  "pokemob.move.uproar": "소란피기",
+  "pokemob.move.stockpile": "비축하기",
+  "pokemob.move.spit-up": "토해내기",
+  "pokemob.move.swallow": "꿀꺽",
+  "pokemob.move.heat-wave": "열풍",
+  "pokemob.move.hail": "싸라기눈",
+  "pokemob.move.torment": "트집",
+  "pokemob.move.flatter": "부추기기",
+  "pokemob.move.will-o-wisp": "도깨비불",
+  "pokemob.move.memento": "추억의선물",
+  "pokemob.move.facade": "객기",
+  "pokemob.move.focus-punch": "힘껏펀치",
+  "pokemob.move.smelling-salts": "정신차리기",
+  "pokemob.move.follow-me": "날따름",
+  "pokemob.move.nature-power": "자연의힘",
+  "pokemob.move.charge": "충전",
+  "pokemob.move.taunt": "도발",
+  "pokemob.move.helping-hand": "도우미",
+  "pokemob.move.trick": "트릭",
+  "pokemob.move.role-play": "역할",
+  "pokemob.move.wish": "희망사항",
+  "pokemob.move.assist": "조수",
+  "pokemob.move.ingrain": "뿌리박기",
+  "pokemob.move.superpower": "엄청난힘",
+  "pokemob.move.magic-coat": "매직코트",
+  "pokemob.move.recycle": "리사이클",
+  "pokemob.move.revenge": "리벤지",
+  "pokemob.move.brick-break": "깨트리다",
+  "pokemob.move.yawn": "하품",
+  "pokemob.move.knock-off": "탁쳐서떨구기",
+  "pokemob.move.endeavor": "죽기살기",
+  "pokemob.move.eruption": "분화",
+  "pokemob.move.skill-swap": "스킬스웹",
+  "pokemob.move.imprison": "봉인",
+  "pokemob.move.refresh": "리프레쉬",
+  "pokemob.move.grudge": "원념",
+  "pokemob.move.snatch": "가로챔",
+  "pokemob.move.secret-power": "비밀의힘",
+  "pokemob.move.dive": "다이빙",
+  "pokemob.move.arm-thrust": "손바닥치기",
+  "pokemob.move.camouflage": "보호색",
+  "pokemob.move.tail-glow": "반딧불",
+  "pokemob.move.luster-purge": "라스트버지",
+  "pokemob.move.mist-ball": "미스트볼",
+  "pokemob.move.feather-dance": "깃털댄스",
+  "pokemob.move.teeter-dance": "흔들흔들댄스",
+  "pokemob.move.blaze-kick": "브레이즈킥",
+  "pokemob.move.mud-sport": "흙놀이",
+  "pokemob.move.ice-ball": "아이스볼",
+  "pokemob.move.needle-arm": "바늘팔",
+  "pokemob.move.slack-off": "태만함",
+  "pokemob.move.hyper-voice": "하이퍼보이스",
+  "pokemob.move.poison-fang": "독엄니",
+  "pokemob.move.crush-claw": "브레이크크루",
+  "pokemob.move.blast-burn": "블러스트번",
+  "pokemob.move.hydro-cannon": "하이드로캐논",
+  "pokemob.move.meteor-mash": "코멧펀치",
+  "pokemob.move.astonish": "놀래키기",
+  "pokemob.move.weather-ball": "웨더볼",
+  "pokemob.move.aromatherapy": "아로마테라피",
+  "pokemob.move.fake-tears": "거짓울음",
+  "pokemob.move.air-cutter": "에어컷터",
+  "pokemob.move.overheat": "오버히트",
+  "pokemob.move.odor-sleuth": "냄새구별",
+  "pokemob.move.rock-tomb": "암석봉인",
+  "pokemob.move.silver-wind": "은빛바람",
+  "pokemob.move.metal-sound": "금속음",
+  "pokemob.move.grass-whistle": "풀피리",
+  "pokemob.move.tickle": "간지르기",
+  "pokemob.move.cosmic-power": "코스믹파워",
+  "pokemob.move.water-spout": "해수스파우팅",
+  "pokemob.move.signal-beam": "시그널빔",
+  "pokemob.move.shadow-punch": "섀도펀치",
+  "pokemob.move.extrasensory": "신통력",
+  "pokemob.move.sky-uppercut": "스카이업퍼",
+  "pokemob.move.sand-tomb": "모래지옥",
+  "pokemob.move.sheer-cold": "절대영도",
+  "pokemob.move.muddy-water": "탁류",
+  "pokemob.move.bullet-seed": "기관총",
+  "pokemob.move.aerial-ace": "제비반환",
+  "pokemob.move.icicle-spear": "고드름침",
+  "pokemob.move.iron-defense": "철벽",
+  "pokemob.move.block": "블록",
+  "pokemob.move.howl": "멀리짖음",
+  "pokemob.move.dragon-claw": "드래곤크루",
+  "pokemob.move.frenzy-plant": "하드플랜트",
+  "pokemob.move.bulk-up": "벌크업",
+  "pokemob.move.bounce": "뛰어오르다",
+  "pokemob.move.mud-shot": "머드숏",
+  "pokemob.move.poison-tail": "포이즌테일",
+  "pokemob.move.covet": "탐내다",
+  "pokemob.move.volt-tackle": "볼트태클",
+  "pokemob.move.magical-leaf": "메지컬리프",
+  "pokemob.move.water-sport": "물놀이",
+  "pokemob.move.calm-mind": "명상",
+  "pokemob.move.leaf-blade": "리프블레이드",
+  "pokemob.move.dragon-dance": "용의춤",
+  "pokemob.move.rock-blast": "락블레스트",
+  "pokemob.move.shock-wave": "전격파",
+  "pokemob.move.water-pulse": "물의파동",
+  "pokemob.move.doom-desire": "파멸의소원",
+  "pokemob.move.psycho-boost": "사이코부스트",
+  "pokemob.move.roost": "날개쉬기",
+  "pokemob.move.gravity": "중력",
+  "pokemob.move.miracle-eye": "미라클아이",
+  "pokemob.move.wake-up-slap": "잠깨움뺨치기",
+  "pokemob.move.hammer-arm": "암해머",
+  "pokemob.move.gyro-ball": "자이로볼",
+  "pokemob.move.healing-wish": "치유소원",
+  "pokemob.move.brine": "소금물",
+  "pokemob.move.natural-gift": "자연의은혜",
+  "pokemob.move.feint": "페인트",
+  "pokemob.move.pluck": "쪼아대기",
+  "pokemob.move.tailwind": "순풍",
+  "pokemob.move.acupressure": "경혈찌르기",
+  "pokemob.move.metal-burst": "메탈버스트",
+  "pokemob.move.u-turn": "유턴",
+  "pokemob.move.close-combat": "인파이트",
+  "pokemob.move.payback": "보복",
+  "pokemob.move.assurance": "승부굳히기",
+  "pokemob.move.embargo": "금제",
+  "pokemob.move.fling": "내던지기",
+  "pokemob.move.psycho-shift": "사이코시프트",
+  "pokemob.move.trump-card": "마지막수단",
+  "pokemob.move.heal-block": "회복봉인",
+  "pokemob.move.wring-out": "쥐어짜기",
+  "pokemob.move.power-trick": "파워트릭",
+  "pokemob.move.gastro-acid": "위액",
+  "pokemob.move.lucky-chant": "주술",
+  "pokemob.move.me-first": "선취",
+  "pokemob.move.copycat": "흉내쟁이",
+  "pokemob.move.power-swap": "파워스웹",
+  "pokemob.move.guard-swap": "가드스웹",
+  "pokemob.move.punishment": "혼내기",
+  "pokemob.move.last-resort": "뒀다쓰기",
+  "pokemob.move.worry-seed": "고민씨",
+  "pokemob.move.sucker-punch": "기습",
+  "pokemob.move.toxic-spikes": "독압정",
+  "pokemob.move.heart-swap": "하트스웹",
+  "pokemob.move.aqua-ring": "아쿠아링",
+  "pokemob.move.magnet-rise": "전자부유",
+  "pokemob.move.flare-blitz": "플레어드라이브",
+  "pokemob.move.force-palm": "발경",
+  "pokemob.move.aura-sphere": "파동탄",
+  "pokemob.move.rock-polish": "록커트",
+  "pokemob.move.poison-jab": "독찌르기",
+  "pokemob.move.dark-pulse": "악의파동",
+  "pokemob.move.night-slash": "깜짝베기",
+  "pokemob.move.aqua-tail": "아쿠아테일",
+  "pokemob.move.seed-bomb": "씨폭탄",
+  "pokemob.move.air-slash": "에어슬래시",
+  "pokemob.move.x-scissor": "시저크로스",
+  "pokemob.move.bug-buzz": "벌레의야단법석",
+  "pokemob.move.dragon-pulse": "용의파동",
+  "pokemob.move.dragon-rush": "드래곤다이브",
+  "pokemob.move.power-gem": "파워젬",
+  "pokemob.move.drain-punch": "드레인펀치",
+  "pokemob.move.vacuum-wave": "진공파",
+  "pokemob.move.focus-blast": "기합구슬",
+  "pokemob.move.energy-ball": "에너지볼",
+  "pokemob.move.brave-bird": "브레이브버드",
+  "pokemob.move.earth-power": "대지의힘",
+  "pokemob.move.switcheroo": "바꿔치기",
+  "pokemob.move.giga-impact": "기가임팩트",
+  "pokemob.move.nasty-plot": "나쁜음모",
+  "pokemob.move.bullet-punch": "불릿펀치",
+  "pokemob.move.avalanche": "눈사태",
+  "pokemob.move.ice-shard": "얼음뭉치",
+  "pokemob.move.shadow-claw": "섀도크루",
+  "pokemob.move.thunder-fang": "번개엄니",
+  "pokemob.move.ice-fang": "얼음엄니",
+  "pokemob.move.fire-fang": "불꽃엄니",
+  "pokemob.move.shadow-sneak": "야습",
+  "pokemob.move.mud-bomb": "진흙폭탄",
+  "pokemob.move.psycho-cut": "사이코커터",
+  "pokemob.move.zen-headbutt": "사념의박치기",
+  "pokemob.move.mirror-shot": "미러숏",
+  "pokemob.move.flash-cannon": "러스터캐논",
+  "pokemob.move.rock-climb": "락클라임",
+  "pokemob.move.defog": "안개제거",
+  "pokemob.move.trick-room": "트릭룸",
+  "pokemob.move.draco-meteor": "용성군",
+  "pokemob.move.discharge": "방전",
+  "pokemob.move.lava-plume": "분연",
+  "pokemob.move.leaf-storm": "리프스톰",
+  "pokemob.move.power-whip": "파워휩",
+  "pokemob.move.rock-wrecker": "암석포",
+  "pokemob.move.cross-poison": "크로스포이즌",
+  "pokemob.move.gunk-shot": "더스트슈트",
+  "pokemob.move.iron-head": "아이언헤드",
+  "pokemob.move.magnet-bomb": "마그넷봄",
+  "pokemob.move.stone-edge": "스톤에지",
+  "pokemob.move.captivate": "유혹",
+  "pokemob.move.stealth-rock": "스텔스록",
+  "pokemob.move.grass-knot": "풀묶기",
+  "pokemob.move.chatter": "수다",
+  "pokemob.move.judgment": "심판의뭉치",
+  "pokemob.move.bug-bite": "벌레먹음",
+  "pokemob.move.charge-beam": "차지빔",
+  "pokemob.move.wood-hammer": "우드해머",
+  "pokemob.move.aqua-jet": "아쿠아제트",
+  "pokemob.move.attack-order": "공격지령",
+  "pokemob.move.defend-order": "방어지령",
+  "pokemob.move.heal-order": "회복지령",
+  "pokemob.move.head-smash": "양날박치기",
+  "pokemob.move.double-hit": "더블어택",
+  "pokemob.move.roar-of-time": "시간의포효",
+  "pokemob.move.spacial-rend": "공간절단",
+  "pokemob.move.lunar-dance": "초승달춤",
+  "pokemob.move.crush-grip": "묵사발",
+  "pokemob.move.magma-storm": "마그마스톰",
+  "pokemob.move.dark-void": "다크홀",
+  "pokemob.move.seed-flare": "시드플레어",
+  "pokemob.move.ominous-wind": "괴상한바람",
+  "pokemob.move.shadow-force": "섀도다이브",
+  "pokemob.move.hone-claws": "손톱갈기",
+  "pokemob.move.wide-guard": "와이드가드",
+  "pokemob.move.guard-split": "가드셰어",
+  "pokemob.move.power-split": "파워셰어",
+  "pokemob.move.wonder-room": "원더룸",
+  "pokemob.move.psyshock": "사이코쇼크",
+  "pokemob.move.venoshock": "베놈쇼크",
+  "pokemob.move.autotomize": "바디퍼지",
+  "pokemob.move.rage-powder": "분노가루",
+  "pokemob.move.telekinesis": "텔레키네시스",
+  "pokemob.move.magic-room": "매직룸",
+  "pokemob.move.smack-down": "떨어뜨리기",
+  "pokemob.move.storm-throw": "업어후리기",
+  "pokemob.move.flame-burst": "불꽃튀기기",
+  "pokemob.move.sludge-wave": "오물웨이브",
+  "pokemob.move.quiver-dance": "나비춤",
+  "pokemob.move.heavy-slam": "헤비봄버",
+  "pokemob.move.synchronoise": "싱크로노이즈",
+  "pokemob.move.electro-ball": "일렉트릭볼",
+  "pokemob.move.soak": "물붓기",
+  "pokemob.move.flame-charge": "니트로차지",
+  "pokemob.move.coil": "똬리틀기",
+  "pokemob.move.low-sweep": "로킥",
+  "pokemob.move.acid-spray": "애시드봄",
+  "pokemob.move.foul-play": "속임수",
+  "pokemob.move.simple-beam": "심플빔",
+  "pokemob.move.entrainment": "동료만들기",
+  "pokemob.move.after-you": "당신먼저",
+  "pokemob.move.round": "돌림노래",
+  "pokemob.move.echoed-voice": "에코보이스",
+  "pokemob.move.chip-away": "야금야금",
+  "pokemob.move.clear-smog": "클리어스모그",
+  "pokemob.move.stored-power": "어시스트파워",
+  "pokemob.move.quick-guard": "퍼스트가드",
+  "pokemob.move.ally-switch": "사이드체인지",
+  "pokemob.move.scald": "열탕",
+  "pokemob.move.shell-smash": "껍질깨기",
+  "pokemob.move.heal-pulse": "치유파동",
+  "pokemob.move.hex": "병상첨병",
+  "pokemob.move.sky-drop": "프리폴",
+  "pokemob.move.shift-gear": "기어체인지",
+  "pokemob.move.circle-throw": "배대뒤치기",
+  "pokemob.move.incinerate": "불태우기",
+  "pokemob.move.quash": "순서미루기",
+  "pokemob.move.acrobatics": "애크러뱃",
+  "pokemob.move.reflect-type": "미러타입",
+  "pokemob.move.retaliate": "원수갚기",
+  "pokemob.move.final-gambit": "목숨걸기",
+  "pokemob.move.bestow": "기프트패스",
+  "pokemob.move.inferno": "연옥",
+  "pokemob.move.water-pledge": "물의맹세",
+  "pokemob.move.fire-pledge": "불꽃의맹세",
+  "pokemob.move.grass-pledge": "풀의맹세",
+  "pokemob.move.volt-switch": "볼트체인지",
+  "pokemob.move.struggle-bug": "벌레의저항",
+  "pokemob.move.bulldoze": "땅고르기",
+  "pokemob.move.frost-breath": "얼음숨결",
+  "pokemob.move.dragon-tail": "드래곤테일",
+  "pokemob.move.work-up": "분발",
+  "pokemob.move.electroweb": "일렉트릭네트",
+  "pokemob.move.wild-charge": "와일드볼트",
+  "pokemob.move.drill-run": "드릴라이너",
+  "pokemob.move.dual-chop": "더블촙",
+  "pokemob.move.heart-stamp": "하트스탬프",
+  "pokemob.move.horn-leech": "우드호른",
+  "pokemob.move.sacred-sword": "성스러운칼",
+  "pokemob.move.razor-shell": "셸블레이드",
+  "pokemob.move.heat-crash": "히트스탬프",
+  "pokemob.move.leaf-tornado": "그래스믹서",
+  "pokemob.move.steamroller": "하드롤러",
+  "pokemob.move.cotton-guard": "코튼가드",
+  "pokemob.move.night-daze": "나이트버스트",
+  "pokemob.move.psystrike": "사이코브레이크",
+  "pokemob.move.tail-slap": "스위프뺨치기",
+  "pokemob.move.hurricane": "폭풍",
+  "pokemob.move.head-charge": "아프로브레이크",
+  "pokemob.move.gear-grind": "기어소서",
+  "pokemob.move.searing-shot": "화염탄",
+  "pokemob.move.techno-blast": "테크노버스터",
+  "pokemob.move.relic-song": "옛노래",
+  "pokemob.move.secret-sword": "신비의칼",
+  "pokemob.move.glaciate": "얼다세계",
+  "pokemob.move.bolt-strike": "뇌격",
+  "pokemob.move.blue-flare": "푸른불꽃",
+  "pokemob.move.fiery-dance": "불꽃춤",
+  "pokemob.move.freeze-shock": "프리즈볼트",
+  "pokemob.move.ice-burn": "콜드플레어",
+  "pokemob.move.snarl": "바크아웃",
+  "pokemob.move.icicle-crash": "고드름떨구기",
+  "pokemob.move.v-create": "V제너레이트",
+  "pokemob.move.fusion-flare": "크로스플레임",
+  "pokemob.move.fusion-bolt": "크로스썬더",
+  "pokemob.move.flying-press": "플라잉프레스",
+  "pokemob.move.mat-block": "마룻바닥세워막기",
+  "pokemob.move.belch": "트림",
+  "pokemob.move.rototiller": "일구기",
+  "pokemob.move.sticky-web": "끈적끈적네트",
+  "pokemob.move.fell-stinger": "마지막일침",
+  "pokemob.move.phantom-force": "고스트다이브",
+  "pokemob.move.trick-or-treat": "핼러윈",
+  "pokemob.move.noble-roar": "부르짖기",
+  "pokemob.move.ion-deluge": "플라스마샤워",
+  "pokemob.move.parabolic-charge": "파라볼라차지",
+  "pokemob.move.forests-curse": "숲의저주",
+  "pokemob.move.petal-blizzard": "꽃보라",
+  "pokemob.move.freeze-dry": "프리즈드라이",
+  "pokemob.move.disarming-voice": "차밍보이스",
+  "pokemob.move.parting-shot": "막말내뱉기",
+  "pokemob.move.topsy-turvy": "뒤집어엎기",
+  "pokemob.move.draining-kiss": "드레인키스",
+  "pokemob.move.crafty-shield": "트릭가드",
+  "pokemob.move.flower-shield": "플라워가드",
+  "pokemob.move.grassy-terrain": "그래스필드",
+  "pokemob.move.misty-terrain": "미스트필드",
+  "pokemob.move.electrify": "송전",
+  "pokemob.move.play-rough": "치근거리기",
+  "pokemob.move.fairy-wind": "요정의바람",
+  "pokemob.move.moonblast": "문포스",
+  "pokemob.move.boomburst": "폭음파",
+  "pokemob.move.fairy-lock": "페어리록",
+  "pokemob.move.kings-shield": "킹실드",
+  "pokemob.move.play-nice": "친해지기",
+  "pokemob.move.confide": "비밀이야기",
+  "pokemob.move.diamond-storm": "다이아스톰",
+  "pokemob.move.steam-eruption": "스팀버스트",
+  "pokemob.move.hyperspace-hole": "다른차원홀",
+  "pokemob.move.water-shuriken": "물수리검",
+  "pokemob.move.mystical-fire": "매지컬플레임",
+  "pokemob.move.spiky-shield": "니들가드",
+  "pokemob.move.aromatic-mist": "아로마미스트",
+  "pokemob.move.eerie-impulse": "괴전파",
+  "pokemob.move.venom-drench": "베놈트랩",
+  "pokemob.move.powder": "분진",
+  "pokemob.move.geomancy": "지오컨트롤",
+  "pokemob.move.magnetic-flux": "자기장조작",
+  "pokemob.move.happy-hour": "해피타임",
+  "pokemob.move.electric-terrain": "일렉트릭필드",
+  "pokemob.move.dazzling-gleam": "매지컬샤인",
+  "pokemob.move.celebrate": "축하",
+  "pokemob.move.hold-hands": "손에손잡기",
+  "pokemob.move.baby-doll-eyes": "초롱초롱눈동자",
+  "pokemob.move.nuzzle": "볼부비부비",
+  "pokemob.move.hold-back": "적당히손봐주기",
+  "pokemob.move.infestation": "엉겨붙기",
+  "pokemob.move.power-up-punch": "그로우펀치",
+  "pokemob.move.oblivion-wing": "데스윙",
+  "pokemob.move.thousand-arrows": "사우전드애로",
+  "pokemob.move.thousand-waves": "사우전드웨이브",
+  "pokemob.move.lands-wrath": "그라운드포스",
+  "pokemob.move.light-of-ruin": "파멸의빛",
+  "pokemob.move.origin-pulse": "근원의파동",
+  "pokemob.move.precipice-blades": "단애의칼",
+  "pokemob.move.dragon-ascent": "화룡점정",
+  "pokemob.move.hyperspace-fury": "다른차원러시",
+  "pokemob.move.breakneck-blitz--physical": "울트라대시어택",
+  "pokemob.move.breakneck-blitz--special": "울트라대시어택",
+  "pokemob.move.all-out-pummeling--physical": "전력무쌍격렬권",
+  "pokemob.move.all-out-pummeling--special": "전력무쌍격렬권",
+  "pokemob.move.supersonic-skystrike--physical": "파이널다이브클래시",
+  "pokemob.move.supersonic-skystrike--special": "파이널다이브클래시",
+  "pokemob.move.acid-downpour--physical": "애시드포이즌딜리트",
+  "pokemob.move.acid-downpour--special": "애시드포이즌딜리트",
+  "pokemob.move.tectonic-rage--physical": "라이징랜드오버",
+  "pokemob.move.tectonic-rage--special": "라이징랜드오버",
+  "pokemob.move.continental-crush--physical": "월즈엔드폴",
+  "pokemob.move.continental-crush--special": "월즈엔드폴",
+  "pokemob.move.savage-spin-out--physical": "절대포식회전참",
+  "pokemob.move.savage-spin-out--special": "절대포식회전참",
+  "pokemob.move.never-ending-nightmare--physical": "무한암야로의유인",
+  "pokemob.move.never-ending-nightmare--special": "무한암야로의유인",
+  "pokemob.move.corkscrew-crash--physical": "초월나선연격",
+  "pokemob.move.corkscrew-crash--special": "초월나선연격",
+  "pokemob.move.inferno-overdrive--physical": "다이내믹풀플레임",
+  "pokemob.move.inferno-overdrive--special": "다이내믹풀플레임",
+  "pokemob.move.hydro-vortex--physical": "슈퍼아쿠아토네이도",
+  "pokemob.move.hydro-vortex--special": "슈퍼아쿠아토네이도",
+  "pokemob.move.bloom-doom--physical": "블룸샤인엑스트라",
+  "pokemob.move.bloom-doom--special": "블룸샤인엑스트라",
+  "pokemob.move.gigavolt-havoc--physical": "스파킹기가볼트",
+  "pokemob.move.gigavolt-havoc--special": "스파킹기가볼트",
+  "pokemob.move.shattered-psyche--physical": "맥시멈사이브레이커",
+  "pokemob.move.shattered-psyche--special": "맥시멈사이브레이커",
+  "pokemob.move.subzero-slammer--physical": "레이징지오프리즈",
+  "pokemob.move.subzero-slammer--special": "레이징지오프리즈",
+  "pokemob.move.devastating-drake--physical": "얼티메이트드래곤번",
+  "pokemob.move.devastating-drake--special": "얼티메이트드래곤번",
+  "pokemob.move.black-hole-eclipse--physical": "블랙홀이클립스",
+  "pokemob.move.black-hole-eclipse--special": "블랙홀이클립스",
+  "pokemob.move.twinkle-tackle--physical": "러블리스타임팩트",
+  "pokemob.move.twinkle-tackle--special": "러블리스타임팩트",
+  "pokemob.move.catastropika": "필살피카슛",
+  "pokemob.move.shore-up": "모래모으기",
+  "pokemob.move.first-impression": "만나자마자",
+  "pokemob.move.baneful-bunker": "토치카",
+  "pokemob.move.spirit-shackle": "그림자꿰매기",
+  "pokemob.move.darkest-lariat": "DD래리어트",
+  "pokemob.move.sparkling-aria": "물거품아리아",
+  "pokemob.move.ice-hammer": "아이스해머",
+  "pokemob.move.floral-healing": "플라워힐",
+  "pokemob.move.high-horsepower": "10만마력",
+  "pokemob.move.strength-sap": "힘흡수",
+  "pokemob.move.solar-blade": "솔라블레이드",
+  "pokemob.move.leafage": "나뭇잎",
+  "pokemob.move.spotlight": "스포트라이트",
+  "pokemob.move.toxic-thread": "독실",
+  "pokemob.move.laser-focus": "예민해지기",
+  "pokemob.move.gear-up": "어시스트기어",
+  "pokemob.move.throat-chop": "지옥찌르기",
+  "pokemob.move.pollen-puff": "꽃가루경단",
+  "pokemob.move.anchor-shot": "앵커숏",
+  "pokemob.move.psychic-terrain": "사이코필드",
+  "pokemob.move.lunge": "덤벼들기",
+  "pokemob.move.fire-lash": "불꽃채찍",
+  "pokemob.move.power-trip": "기어오르기",
+  "pokemob.move.burn-up": "불사르기",
+  "pokemob.move.speed-swap": "스피드스웹",
+  "pokemob.move.smart-strike": "스마트호른",
+  "pokemob.move.purify": "정화",
+  "pokemob.move.revelation-dance": "잠재댄스",
+  "pokemob.move.core-enforcer": "코어퍼니셔",
+  "pokemob.move.trop-kick": "트로피컬킥",
+  "pokemob.move.instruct": "지휘",
+  "pokemob.move.beak-blast": "부리캐논",
+  "pokemob.move.clanging-scales": "스케일노이즈",
+  "pokemob.move.dragon-hammer": "드래곤해머",
+  "pokemob.move.brutal-swing": "세차게휘두르기",
+  "pokemob.move.aurora-veil": "오로라베일",
+  "pokemob.move.sinister-arrow-raid": "섀도애로우즈스트라이크",
+  "pokemob.move.malicious-moonsault": "하이퍼다크크러셔",
+  "pokemob.move.oceanic-operetta": "바다의심포니",
+  "pokemob.move.guardian-of-alola": "알로라의수호자",
+  "pokemob.move.soul-stealing-7-star-strike": "칠성탈혼퇴",
+  "pokemob.move.stoked-sparksurfer": "라이트닝서프라이드",
+  "pokemob.move.pulverizing-pancake": "진심의공격",
+  "pokemob.move.extreme-evoboost": "나인이볼부스트",
+  "pokemob.move.genesis-supernova": "오리진즈슈퍼노바",
+  "pokemob.move.shell-trap": "트랩셸",
+  "pokemob.move.fleur-cannon": "플뢰르캐논",
+  "pokemob.move.psychic-fangs": "사이코팽",
+  "pokemob.move.stomping-tantrum": "분함의발구르기",
+  "pokemob.move.shadow-bone": "섀도본",
+  "pokemob.move.accelerock": "액셀록",
+  "pokemob.move.liquidation": "아쿠아브레이크",
+  "pokemob.move.prismatic-laser": "프리즘레이저",
+  "pokemob.move.spectral-thief": "섀도스틸",
+  "pokemob.move.sunsteel-strike": "메테오드라이브",
+  "pokemob.move.moongeist-beam": "섀도레이",
+  "pokemob.move.tearful-look": "눈물그렁그렁",
+  "pokemob.move.zing-zap": "찌리리따끔따끔",
+  "pokemob.move.natures-madness": "자연의분노",
+  "pokemob.move.multi-attack": "멀티어택",
+  "pokemob.move.10-000-000-volt-thunderbolt": "1000만볼트",
+  "pokemob.move.mind-blown": "깜짝헤드",
+  "pokemob.move.plasma-fists": "플라스마피스트",
+  "pokemob.move.photon-geyser": "포톤가이저",
+  "pokemob.move.light-that-burns-the-sky": "하늘을태우는멸망의빛",
+  "pokemob.move.searing-sunraze-smash": "선샤인스매셔",
+  "pokemob.move.menacing-moonraze-maelstrom": "문라이트블래스터",
+  "pokemob.move.lets-snuggle-forever": "투닥투닥프렌드타임",
+  "pokemob.move.splintered-stormshards": "레이디얼에지스톰",
+  "pokemob.move.clangorous-soulblaze": "브레이징소울비트",
+  "pokemob.move.zippy-zap": "파찌파찌액셀",
+  "pokemob.move.splishy-splash": "참방참방서핑",
+  "pokemob.move.floaty-fall": "둥실둥실폴",
+  "pokemob.move.pika-papow": "피카피카썬더",
+  "pokemob.move.bouncy-bubble": "생생버블",
+  "pokemob.move.buzzy-buzz": "찌릿찌릿일렉",
+  "pokemob.move.sizzly-slide": "이글이글번",
+  "pokemob.move.glitzy-glow": "콸콸오라",
+  "pokemob.move.baddy-bad": "아그아그존",
+  "pokemob.move.sappy-seed": "쑥쑥봄버",
+  "pokemob.move.freezy-frost": "꽁꽁프로스트",
+  "pokemob.move.sparkly-swirl": "반짝반짝스톰",
+  "pokemob.move.veevee-volley": "브이브이브레이크",
+  "pokemob.move.double-iron-bash": "더블펀처",
+  "pokemob.move.max-guard": "다이월",
+  "pokemob.move.dynamax-cannon": "다이맥스포",
+  "pokemob.move.snipe-shot": "노려맞히기",
+  "pokemob.move.jaw-lock": "물고버티기",
+  "pokemob.move.stuff-cheeks": "볼가득넣기",
+  "pokemob.move.no-retreat": "배수의진",
+  "pokemob.move.tar-shot": "타르숏",
+  "pokemob.move.magic-powder": "마법가루",
+  "pokemob.move.dragon-darts": "드래곤애로",
+  "pokemob.move.teatime": "다과회",
+  "pokemob.move.octolock": "문어굳히기",
+  "pokemob.move.bolt-beak": "전격부리",
+  "pokemob.move.fishious-rend": "아가미물기",
+  "pokemob.move.court-change": "코트체인지",
+  "pokemob.move.max-flare": "다이번",
+  "pokemob.move.max-flutterby": "다이웜",
+  "pokemob.move.max-lightning": "다이썬더",
+  "pokemob.move.max-strike": "다이어택",
+  "pokemob.move.max-knuckle": "다이너클",
+  "pokemob.move.max-phantasm": "다이할로우",
+  "pokemob.move.max-hailstorm": "다이아이스",
+  "pokemob.move.max-ooze": "다이애시드",
+  "pokemob.move.max-geyser": "다이스트림",
+  "pokemob.move.max-airstream": "다이제트",
+  "pokemob.move.max-starfall": "다이페어리",
+  "pokemob.move.max-wyrmwind": "다이드라군",
+  "pokemob.move.max-mindstorm": "다이사이코",
+  "pokemob.move.max-rockfall": "다이록",
+  "pokemob.move.max-quake": "다이어스",
+  "pokemob.move.max-darkness": "다이아크",
+  "pokemob.move.max-overgrowth": "다이그래스",
+  "pokemob.move.max-steelspike": "다이스틸",
+  "pokemob.move.clangorous-soul": "소울비트",
+  "pokemob.move.body-press": "바디프레스",
+  "pokemob.move.decorate": "데코레이션",
+  "pokemob.move.drum-beating": "드럼어택",
+  "pokemob.move.snap-trap": "집게덫",
+  "pokemob.move.pyro-ball": "화염볼",
+  "pokemob.move.behemoth-blade": "거수참",
+  "pokemob.move.behemoth-bash": "거수탄",
+  "pokemob.move.aura-wheel": "오라휠",
+  "pokemob.move.breaking-swipe": "와이드브레이커",
+  "pokemob.move.branch-poke": "가지찌르기",
+  "pokemob.move.overdrive": "오버드라이브",
+  "pokemob.move.apple-acid": "사과산",
+  "pokemob.move.grav-apple": "G의힘",
+  "pokemob.move.spirit-break": "소울크래시",
+  "pokemob.move.strange-steam": "원더스팀",
+  "pokemob.move.life-dew": "생명의물방울",
+  "pokemob.move.obstruct": "블로킹",
+  "pokemob.move.false-surrender": "사죄의찌르기",
+  "pokemob.move.meteor-assault": "스타어설트",
+  "pokemob.move.eternabeam": "무한다이빔",
+  "pokemob.move.steel-beam": "철제광선",
+  "pokemob.move.expanding-force": "와이드포스",
+  "pokemob.move.steel-roller": "아이언롤러",
+  "pokemob.move.scale-shot": "스케일샷",
+  "pokemob.move.meteor-beam": "메테오빔",
+  "pokemob.move.shell-side-arm": "셸암즈",
+  "pokemob.move.misty-explosion": "미스트버스트",
+  "pokemob.move.grassy-glide": "그래스슬라이더",
+  "pokemob.move.rising-voltage": "라이징볼트",
+  "pokemob.move.terrain-pulse": "대지의파동",
+  "pokemob.move.skitter-smack": "엄습하는일격",
+  "pokemob.move.burning-jealousy": "질투의불꽃",
+  "pokemob.move.lash-out": "분풀이",
+  "pokemob.move.poltergeist": "폴터가이스트",
+  "pokemob.move.corrosive-gas": "부식가스",
+  "pokemob.move.coaching": "코칭",
+  "pokemob.move.flip-turn": "퀵턴",
+  "pokemob.move.triple-axel": "트리플악셀",
+  "pokemob.move.dual-wingbeat": "더블윙",
+  "pokemob.move.scorching-sands": "열사의대지",
+  "pokemob.move.jungle-healing": "정글힐",
+  "pokemob.move.wicked-blow": "암흑강타",
+  "pokemob.move.surging-strikes": "수류연타",
+  "pokemob.move.thunder-cage": "썬더프리즌",
+  "pokemob.move.dragon-energy": "드래곤에너지",
+  "pokemob.move.freezing-glare": "얼어붙는시선",
+  "pokemob.move.fiery-wrath": "타오르는분노",
+  "pokemob.move.thunderous-kick": "천둥차기",
+  "pokemob.move.glacial-lance": "블리자드랜스",
+  "pokemob.move.astral-barrage": "아스트랄비트",
+  "pokemob.move.eerie-spell": "섬뜩한주문"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/pokecube_moves/lang/nl_NL.lang b/src/main/resources/assets/pokecube_moves/lang/nl_NL.lang
deleted file mode 100644
index edf5fc05cf..0000000000
--- a/src/main/resources/assets/pokecube_moves/lang/nl_NL.lang
+++ /dev/null
@@ -1,662 +0,0 @@
-#Pokecube translation
-
-##Move Messages
-
-pokemob.move.super.effective=Het is super effectief!
-pokemob.move.not.very.effective=Het is niet heel effectief!
-pokemob.move.doesnt.affect=Het had geen effect %1$s!
-pokemob.move.critical.hit=Voltreffer!
-pokemob.move.used=%1$s gebruikte %2$s!
-pokemob.move.enemyUsed=%1$s vijand gebruikte %2$s!
-pokemob.move.stat.fail=maar het mislukte
-pokemob.move.stat.rise1=%1$s's %2$s steeg
-pokemob.move.stat.rise2=%1$s's %2$s steeg sherp
-pokemob.move.stat.rise3=%1$s's %2$s steeg drastisch
-pokemob.move.stat.fall1=%1$s's %2$s daalde
-pokemob.move.stat.fall2=%1$s's %2$s daalde sherp
-pokemob.move.stat.fall3=%1$s's %2$s daalde drastisch
-
-pokemob.move.stat1=Aanval
-pokemob.move.stat2=Verdediging
-pokemob.move.stat3=Speciale Aanval
-pokemob.move.stat4=Speciale Verdediging
-pokemob.move.stat5=Snelheid
-pokemob.move.stat6=Nauwkeurigheid
-pokemob.move.stat7=Ontwijking
-
-pokemob.move.notify.learn=%1$s leerde %2$s
-pokemob.move.terraindamage=%1$s was bezeerd door %2$s
-
-pokemob.move.missed=Het miste %1$s!
-
-pokemob.move.isfrozen=%1$s is bevroren.
-pokemob.move.issleeping=%1$s is aan het slapen.
-pokemob.move.isfullyparalyzed=%1$s is volledig verlamd.
-pokemob.move.paralyzed=%1$s is verlamd.
-pokemob.move.isburned=%1$s is verbrand.
-pokemob.move.ispoisoned=%1$s is vergiftigd.
-pokemob.move.isbadlypoisoned=%1$s is zwaar vergiftigd.
-
-##Move Names
-
-pokemob.move.pound=Stamp
-pokemob.move.karatechop=Karateslag
-pokemob.move.doubleslap=Dubbelslag
-pokemob.move.cometpunch=Komeetslag
-pokemob.move.megapunch=Megaslag
-pokemob.move.payday=Afrekening
-pokemob.move.firepunch=Vuurslag
-pokemob.move.icepunch=Ijsslag
-pokemob.move.thunderpunch=Donderslag
-pokemob.move.scratch=Krab
-pokemob.move.vicegrip=Handgreep
-pokemob.move.guillotine=Guillotine
-pokemob.move.razorwind=Meswind
-pokemob.move.swordsdance=Zwaarddans
-pokemob.move.cut=Snij
-pokemob.move.gust=Windvlaag
-pokemob.move.wingattack=Vleugelaanval
-pokemob.move.whirlwind=Wervelwind
-pokemob.move.fly=Vlieg
-pokemob.move.bind=Koppeling
-pokemob.move.slam=Smijt
-pokemob.move.vinewhip=Roede
-pokemob.move.stomp=Stomp
-pokemob.move.doublekick=Dubbelschop
-pokemob.move.megakick=Megaschop
-pokemob.move.jumpkick=Sprongschop
-pokemob.move.rollingkick=Rolschop
-pokemob.move.sandattack=Zandaanval
-pokemob.move.headbutt=Kopstoot
-pokemob.move.hornattack=Hoornaanval
-pokemob.move.furyattack=Furieaanval
-pokemob.move.horndrill=Hoornboor
-pokemob.move.tackle=Tackle
-pokemob.move.bodyslam=Lijfstraf
-pokemob.move.wrap=Wikkel
-pokemob.move.takedown=Haal neer
-pokemob.move.thrash=Afranseling
-pokemob.move.doubleedge=Weerslag
-pokemob.move.tailwhip=Staartzweep
-pokemob.move.poisonsting=Gifangel
-pokemob.move.twineedle=Dubbelnaald
-pokemob.move.pinmissile=Naaldraket
-pokemob.move.leer=Lonk
-pokemob.move.bite=Beet
-pokemob.move.growl=Grom
-pokemob.move.roar=Brul
-pokemob.move.sing=Zang
-pokemob.move.supersonic=Supersonisch
-pokemob.move.sonicboom=Supersone Knal
-pokemob.move.disable=Uitschakelaar
-pokemob.move.acid=Zuur
-pokemob.move.ember=Sintel
-pokemob.move.flamethrower=Vlammenwerper
-pokemob.move.mist=Mist
-pokemob.move.watergun=Waterpistool
-pokemob.move.hydropump=Hydropomp
-pokemob.move.surf=Surf
-pokemob.move.icebeam=Ijsstraal
-pokemob.move.blizzard=Sneeuwstorm
-pokemob.move.psybeam=Psychostraal
-pokemob.move.bubblebeam=Bubbelstraal
-pokemob.move.aurorabeam=Aurora straal
-pokemob.move.hyperbeam=Hyperstraal
-pokemob.move.peck=Pik
-pokemob.move.drillpeck=Drilboor
-pokemob.move.submission=Onderwerping
-pokemob.move.lowkick=Lage schop
-pokemob.move.counter=Terugslag
-pokemob.move.seismictoss=Seismische worp
-pokemob.move.strength=Kracht
-pokemob.move.absorb=Absorbeer
-pokemob.move.megadrain=Mega Absorbtie #Officially isn't translated?
-pokemob.move.leechseed=Onttrek HP
-pokemob.move.growth=Groei
-pokemob.move.razorleaf=Mesblad
-pokemob.move.solarbeam=Zonne straal
-pokemob.move.poisonpowder=Gifpoeder
-pokemob.move.stunspore=Verdeelspoor
-pokemob.move.sleeppowder=Slaap poeder
-pokemob.move.petaldance=Bloemendans
-pokemob.move.stringshot=Bindschot
-pokemob.move.dragonrage=Drakenfurie
-pokemob.move.firespin=Vuurdraak
-pokemob.move.thundershock=Donderschok
-pokemob.move.thunderbolt=Bliksemstraal
-pokemob.move.thunderwave=Dondergolf
-pokemob.move.thunder=Donder
-pokemob.move.rockthrow=Steenworp
-pokemob.move.earthquake=Aardbeving
-pokemob.move.fissure=Kloof
-pokemob.move.dig=Graaf
-pokemob.move.toxic=Vergiftig
-pokemob.move.confusion=Verwarring
-pokemob.move.psychic=Psychisch
-pokemob.move.hypnosis=Hypnose
-pokemob.move.meditate=Meditatie
-pokemob.move.agility=Behendigheid
-pokemob.move.quickattack=Snelle aanval
-pokemob.move.rage=Razernij
-pokemob.move.teleport=Teleporteer
-pokemob.move.nightshade=Nachtschaduw #This "official" translation is completely wrong, but whatever
-pokemob.move.mimic=Imitatie
-pokemob.move.screech=Gil
-pokemob.move.doubleteam=Dubbelteam
-pokemob.move.recover=Herstel
-pokemob.move.harden=Verharding
-pokemob.move.minimize=Minimalizeer
-pokemob.move.smokescreen=Rookgordijn
-pokemob.move.confuseray=Verwarstraal
-pokemob.move.withdraw=Terugtrekking
-pokemob.move.defensecurl=Verdediging
-pokemob.move.barrier=Barrière
-pokemob.move.lightscreen=Lichtscherm
-pokemob.move.haze=Waas
-pokemob.move.reflect=Reflecteren
-pokemob.move.focusenergy=Focus energie
-pokemob.move.bide=Wacht af
-pokemob.move.metronome=Metronoom
-pokemob.move.mirrormove=Spiegelbeweging
-pokemob.move.selfdestruct=Zelfvernietiging
-pokemob.move.eggbomb=Eierbom
-pokemob.move.lick=Lik
-pokemob.move.smog=Smog
-pokemob.move.sludge=Blubber
-pokemob.move.boneclub=Botknuppel
-pokemob.move.fireblast=Vuurschot
-pokemob.move.waterfall=Waterval
-pokemob.move.clamp=Klem
-pokemob.move.swift=Snel
-pokemob.move.skullbash=Schedelbeuk
-pokemob.move.spikecannon=Spijkerkanon
-pokemob.move.constrict=Klemvast
-pokemob.move.amnesia=Geheugenverlies
-pokemob.move.kinesis=Kinese
-pokemob.move.softboiled=Halfgaar
-pokemob.move.highjumpkick=Hoge Sprongschop
-pokemob.move.glare=Staar
-pokemob.move.dreameater=Droometer
-pokemob.move.poisongas=Gifgas
-pokemob.move.barrage=Speraanval
-pokemob.move.leechlife=Onttrek leven
-pokemob.move.lovelykiss=Nachtkus
-pokemob.move.skyattack=Luchtaanval
-pokemob.move.transform=Transformeer
-pokemob.move.bubble=Bubbel
-pokemob.move.dizzypunch=Duizelslag
-pokemob.move.spore=Spoor
-pokemob.move.flash=Flits
-pokemob.move.psywave=Psychotisch
-pokemob.move.splash=Klater
-pokemob.move.acidarmor=Zuurschild
-pokemob.move.crabhammer=Krabhamer
-pokemob.move.explosion=Explosie
-pokemob.move.furyswipes=Furieslag
-pokemob.move.bonemerang=Botmerang
-pokemob.move.rest=Rust
-pokemob.move.rockslide=Lawine
-pokemob.move.hyperfang=Hyperklauw #Wrong official translation once again, but I can see why they chose to do so
-pokemob.move.sharpen=Versterken
-pokemob.move.conversion=Conversie
-pokemob.move.triattack=Tri aanval
-pokemob.move.superfang=Superklauw
-pokemob.move.slash=Hak
-pokemob.move.substitute=Kloon
-pokemob.move.struggle=Worstel
-pokemob.move.sketch=Schets
-pokemob.move.triplekick=Tripleschop #Only translated half officially?
-pokemob.move.thief=Dief
-pokemob.move.spiderweb=Spinneweb
-pokemob.move.mindreader=Gedachtenlezer
-pokemob.move.nightmare=Nachtmerrie
-pokemob.move.flamewheel=Vlamwiel
-pokemob.move.snore=Snurk
-pokemob.move.curse=Vloek
-pokemob.move.flail=Ranseling
-pokemob.move.conversion2=Conversie 2
-pokemob.move.aeroblast=Luchtschot
-pokemob.move.cottonspore=Katoenspoor
-pokemob.move.reversal=Tegenslag
-pokemob.move.spite=Plaag
-pokemob.move.powdersnow=Poedersneeuw
-pokemob.move.protect=Bescherming
-pokemob.move.machpunch=Mach slag
-pokemob.move.scaryface=Eng gezicht
-pokemob.move.feintattack=Flauwval aanval #Official translation is completely wrong again
-pokemob.move.sweetkiss=Lieve kus
-pokemob.move.bellydrum=Buiktrommel
-pokemob.move.sludgebomb=Blubberbom
-pokemob.move.mudslap=Modderslag
-pokemob.move.octazooka=Octazooka
-pokemob.move.spikes=Spijkers
-pokemob.move.zapcannon=Zapkanon
-pokemob.move.foresight=Vooruitzicht
-pokemob.move.destinybond=Noodlot
-pokemob.move.perishsong=Ondergangslied
-pokemob.move.icywind=Ijswind
-pokemob.move.detect=Detectie
-pokemob.move.bonerush=Botstorm
-pokemob.move.lockon=Aankoppeling
-pokemob.move.outrage=Woede
-pokemob.move.sandstorm=Zandstorm
-pokemob.move.gigadrain=Giga drain # just like mega drain, not translated officially?
-pokemob.move.endure=Uithoudingsvermogen
-pokemob.move.charm=Charme
-pokemob.move.rollout=Doorrol
-pokemob.move.falseswipe=Valse slag
-pokemob.move.swagger=Opschepper
-pokemob.move.milkdrink=Melk drinken
-pokemob.move.spark=Vonk
-pokemob.move.furycutter=Furiesnijder
-pokemob.move.steelwing=Staalvleugel
-pokemob.move.meanlook=Boos oog
-pokemob.move.attract=Aantrekkingskracht
-pokemob.move.sleeptalk=Slaappraat
-pokemob.move.healbell=Genezingsbel
-pokemob.move.return=Terugkeer
-pokemob.move.present=Kadootje
-pokemob.move.frustration=Frustratie
-pokemob.move.safeguard=Beveiliging
-pokemob.move.painsplit=Pijn delen
-pokemob.move.sacredfire=Heilig vuur
-pokemob.move.magnitude=Grootte
-pokemob.move.dynamicpunch=Dynamische slag
-pokemob.move.megahorn=Megahoorn
-pokemob.move.dragonbreath=Drakenadem
-pokemob.move.batonpass=Stokje doorgeven
-pokemob.move.encore=Nog een keer
-pokemob.move.pursuit=Achtervolging
-pokemob.move.rapidspin=Snelle draai
-pokemob.move.sweetscent=Zoete geur
-pokemob.move.irontail=Ijzeren staart
-pokemob.move.metalclaw=Metalen klauw
-pokemob.move.vitalthrow=Levensworp
-pokemob.move.morningsun=Ochtendzon
-pokemob.move.synthesis=Synthese
-pokemob.move.moonlight=Maanlicht
-pokemob.move.hiddenpower=Verborgen kracht
-pokemob.move.crosschop=Kruisslag
-pokemob.move.twister=Cycloon
-pokemob.move.raindance=Regendans
-pokemob.move.sunnyday=Zonnige dag
-pokemob.move.crunch=Knars
-pokemob.move.mirrorcoat=Spiegellaag
-pokemob.move.psychup=Psych Up #No official Dutch translation for this?
-pokemob.move.extremespeed=Extreme snelheid
-pokemob.move.ancientpower=Oude kracht
-pokemob.move.shadowball=Schaduwbal
-pokemob.move.futuresight=Toekomstbeeld
-pokemob.move.rocksmash=Rotsslag
-pokemob.move.whirlpool=Draaikolk
-pokemob.move.beatup=Pak slaag
-pokemob.move.fakeout=Huichel #This is where the Dutch Pokémon wiki stops offering official translations
-pokemob.move.uproar=Oproer
-pokemob.move.stockpile=Voorraad
-pokemob.move.spitup=Uitspugen
-pokemob.move.swallow=Doorslikken
-pokemob.move.heatwave=Hittegolf
-pokemob.move.hail=Hagel
-pokemob.move.torment=Kwel
-pokemob.move.flatter=Vlei
-pokemob.move.willowisp=Dwaallicht
-pokemob.move.memento=Aandenken
-pokemob.move.facade=Facade
-pokemob.move.focuspunch=Focusslag
-pokemob.move.smellingsalts=Reukzout
-pokemob.move.followme=Volg me
-pokemob.move.naturepower=Natuurkracht
-pokemob.move.charge=Opladen
-pokemob.move.taunt=Uitdaging
-pokemob.move.helpinghand=Helpende hand
-pokemob.move.trick=Truc
-pokemob.move.roleplay=Rollenspel
-pokemob.move.wish=Wens
-pokemob.move.assist=Bijstaan
-pokemob.move.ingrain=Inwortelen
-pokemob.move.superpower=Superkracht
-pokemob.move.magiccoat=Magische mantel
-pokemob.move.recycle=Recycle
-pokemob.move.revenge=Wraak
-pokemob.move.brickbreak=Klinkerbraak
-pokemob.move.yawn=Gaap
-pokemob.move.knockoff=Afslaan
-pokemob.move.endeavor=Poging
-pokemob.move.eruption=Uitbarsting
-pokemob.move.skillswap=Ervaringswissel
-pokemob.move.imprison=Sluit op
-pokemob.move.refresh=Verfris
-pokemob.move.grudge=Wrok
-pokemob.move.snatch=Gris
-pokemob.move.secretpower=Geheime kracht
-pokemob.move.dive=Duik
-pokemob.move.armthrust=Armstoot
-pokemob.move.camouflage=Camouflage
-pokemob.move.tailglow=Gloeistaart
-pokemob.move.lusterpurge=Ontglanzing
-pokemob.move.mistball=Mistbal
-pokemob.move.featherdance=Verendans
-pokemob.move.teeterdance=Wankele dans
-pokemob.move.blazekick=Fikschop
-pokemob.move.mudsport=Modderspel
-pokemob.move.iceball=Ijsbal
-pokemob.move.needlearm=Naaldarm
-pokemob.move.slackoff=Treuzel
-pokemob.move.hypervoice=Hyperstem
-pokemob.move.poisonfang=Giftand
-pokemob.move.crushclaw=Persklauw
-pokemob.move.blastburn=Brandwond
-pokemob.move.hydrocannon=Hydrokanon
-pokemob.move.meteormash=Meteoorslag
-pokemob.move.astonish=Verbazen
-pokemob.move.weatherball=Weerbal
-pokemob.move.aromatherapy=Aromatherapie
-pokemob.move.faketears=Neptranen
-pokemob.move.aircutter=Luchtsnijder
-pokemob.move.overheat=Oververhitting
-pokemob.move.odorsleuth=Geurspeur
-pokemob.move.rocktomb=Rotsgraf
-pokemob.move.silverwind=Zilverwind
-pokemob.move.metalsound=Metaalgeluid
-pokemob.move.grasswhistle=Grasfluit
-pokemob.move.tickle=Kietel
-pokemob.move.cosmicpower=Kosmische kracht
-pokemob.move.waterspout=Watertuit
-pokemob.move.signalbeam=Lichtkogel
-pokemob.move.shadowpunch=Schaduwslag
-pokemob.move.extrasensory=Paranormaal
-pokemob.move.skyuppercut=Hemeluppercut
-pokemob.move.sandtomb=Zandgraf
-pokemob.move.sheercold=Zuivere kou
-pokemob.move.muddywater=Modderig water
-pokemob.move.bulletseed=Kogelzaad
-pokemob.move.aerialace=Zwaluwterugkeer
-pokemob.move.iciclespear=Ijspegelspeer
-pokemob.move.irondefense=Ijzerverdediging
-pokemob.move.block=Blokkeer
-pokemob.move.howl=Jank
-pokemob.move.dragonclaw=Drakenklauw
-pokemob.move.frenzyplant=Waanzinplant
-pokemob.move.bulkup=Hoop op
-pokemob.move.bounce=Stuiter
-pokemob.move.mudshot=Modderschot
-pokemob.move.poisontail=Gifstaart
-pokemob.move.covet=Begeer
-pokemob.move.volttackle=Volttackle
-pokemob.move.magicalleaf=Magisch blad
-pokemob.move.watersport=Waterspel
-pokemob.move.calmmind=Kalme geest
-pokemob.move.leafblade=Bladswaard
-pokemob.move.dragondance=Drakendans
-pokemob.move.rockblast=Rotsstoot
-pokemob.move.shockwave=Schokgolf
-pokemob.move.waterpulse=Waterpuls
-pokemob.move.doomdesire=Vernietigingswens
-pokemob.move.psychoboost=Psycho toename 
-pokemob.move.roost=Zitstok
-pokemob.move.gravity=Zwaartekracht
-pokemob.move.miracleeye=Mirakeloog
-pokemob.move.wakeupslap=Wekkende mep
-pokemob.move.hammerarm=Hamerarm
-pokemob.move.gyroball=Draaibal
-pokemob.move.healingwish=Genezingswens
-pokemob.move.brine=Zeezout
-pokemob.move.naturalgift=Natuurlijk geschenk
-pokemob.move.feint=Scheinbeweging
-pokemob.move.pluck=pluk
-pokemob.move.tailwind=Rugwind
-pokemob.move.acupressure=Vingerdruk
-pokemob.move.metalburst=Metaaluitbarsting
-pokemob.move.uturn=U-bocht
-pokemob.move.closecombat=Melee #This is actually a Dutch word as well
-pokemob.move.payback=Betaald zetten
-pokemob.move.assurance=Zelfverzekering
-pokemob.move.embargo=Verbod
-pokemob.move.fling=Werpen
-pokemob.move.psychoshift=Psycho verschuiving
-pokemob.move.trumpcard=Troefkaart
-pokemob.move.healblock=Blokkeer genezing
-pokemob.move.wringout=Uitwringing
-pokemob.move.powertrick=Krachttruc
-pokemob.move.gastroacid=Maagzuur
-pokemob.move.luckychant=Geluksgezang
-pokemob.move.mefirst=Ik eerst
-pokemob.move.copycat=Na-aper
-pokemob.move.powerswap=Krachtruil
-pokemob.move.guardswap=Verdedigingruil
-pokemob.move.punishment=Straf
-pokemob.move.lastresort=Laatste redmiddel
-pokemob.move.worryseed=Zorgzaad
-pokemob.move.suckerpunch=Onverwachte slag
-pokemob.move.toxicspikes=Giftige spijkers
-pokemob.move.heartswap=Hartenruil
-pokemob.move.aquaring=Waterring
-pokemob.move.magnetrise=Magneetopstijging
-pokemob.move.flareblitz=Steekvlamaanval
-pokemob.move.forcepalm=Krachtstoot
-pokemob.move.aurasphere=Aurabol
-pokemob.move.rockpolish=Steenpoets
-pokemob.move.poisonjab=Gifsteek
-pokemob.move.darkpulse=Donkerpuls
-pokemob.move.nightslash=Nachthouw
-pokemob.move.aquatail=Waterstaart
-pokemob.move.seedbomb=Zaadbom
-pokemob.move.airslash=Luchthak
-pokemob.move.xscissor=X-Schaar
-pokemob.move.bugbuzz=Insectengezoem
-pokemob.move.dragonpulse=Drakenpuls
-pokemob.move.dragonrush=Drakenduik
-pokemob.move.powergem=Krachtjuweel
-pokemob.move.drainpunch=Draineerslag
-pokemob.move.vacuumwave=Vacuümgolf
-pokemob.move.focusblast=Focusstoot
-pokemob.move.energyball=Energiebal
-pokemob.move.bravebird=Overmoedigheid #This fits the description better
-pokemob.move.earthpower=Aardkracht
-pokemob.move.switcheroo=Geheime wissel
-pokemob.move.gigaimpact=Gigabotsing
-pokemob.move.nastyplot=Smerig complot
-pokemob.move.bulletpunch=Kogelslag
-pokemob.move.avalanche=Lawine
-pokemob.move.iceshard=Ijsscherf
-pokemob.move.shadowclaw=Schaduwklauw
-pokemob.move.thunderfang=Dondertand
-pokemob.move.icefang=Ijstand
-pokemob.move.firefang=Vuurtand
-pokemob.move.shadowsneak=Schaduwsluip
-pokemob.move.mudbomb=Modderbom
-pokemob.move.psychocut=Psychosnoei
-pokemob.move.zenheadbutt=Zen kopstoot
-pokemob.move.mirrorshot=Spiegelschot
-pokemob.move.flashcannon=Flitskanon
-pokemob.move.rockclimb=Rotsklim
-pokemob.move.defog=Ontnevel
-pokemob.move.trickroom=Trukenkamer
-pokemob.move.dracometeor=Drakenmeteoor
-pokemob.move.discharge=Ontlading
-pokemob.move.lavaplume=Lavapluim
-pokemob.move.leafstorm=Bladerstorm
-pokemob.move.powerwhip=Krachtzweep
-pokemob.move.rockwrecker=Steenverwoester
-pokemob.move.crosspoison=Kruisvergif
-pokemob.move.gunkshot=Smurrieschot
-pokemob.move.ironhead=Ijzerhoofd
-pokemob.move.magnetbomb=Magneetbom
-pokemob.move.stoneedge=Steenlemet
-pokemob.move.captivate=Betoveren
-pokemob.move.stealthrock=Camouflagerots
-pokemob.move.grassknot=Grasknoop 
-pokemob.move.chatter=Gebabbel
-pokemob.move.judgment=Oordeel
-pokemob.move.bugbite=Insectenbeet
-pokemob.move.chargebeam=Ladingstraal
-pokemob.move.woodhammer=Houthamer
-pokemob.move.aquajet=Waterspuit
-pokemob.move.attackorder=Aanvalsbevel
-pokemob.move.defendorder=Verdedigingsbevel
-pokemob.move.healorder=Genezingsbevel
-pokemob.move.headsmash=Hoofdbreker
-pokemob.move.doublehit=Dubbele treffer
-pokemob.move.roaroftime=Brul des tijds
-pokemob.move.spacialrend=Universumscheur
-pokemob.move.lunardance=Maandans
-pokemob.move.crushgrip=Verbrijzelgrip
-pokemob.move.magmastorm=Magmastorm
-pokemob.move.darkvoid=Donkere leegte
-pokemob.move.seedflare=Zaadexplosie #Giggity
-pokemob.move.ominouswind=Onheilspellende Wind
-pokemob.move.shadowforce=Schaduwkracht
-pokemob.move.honeclaws=Klauwverscherping
-pokemob.move.wideguard=Brede beschermer
-pokemob.move.guardsplit=Verdedigingssplitsing
-pokemob.move.powersplit=Krachtsplitsing
-pokemob.move.wonderroom=Wonderkamer
-pokemob.move.psyshock=Psyschok
-pokemob.move.venoshock=Gifschock
-pokemob.move.autotomize=Automatizeer
-pokemob.move.ragepowder=Woedepoeder
-pokemob.move.telekinesis=Telekinese
-pokemob.move.magicroom=Magische kamer
-pokemob.move.smackdown=Neergooi
-pokemob.move.stormthrow=Stormgooi
-pokemob.move.flameburst=Vlamuitbarsting
-pokemob.move.sludgewave=Moddergolf
-pokemob.move.quiverdance=Bibberdans
-pokemob.move.heavyslam=Zware slag
-pokemob.move.synchronoise=Synchreluid
-pokemob.move.electroball=Elektrobal
-pokemob.move.soak=Week
-pokemob.move.flamecharge=Vlammenaanval
-pokemob.move.coil=Spiraal
-pokemob.move.lowsweep=Lage veeg
-pokemob.move.acidspray=Zuurspray
-pokemob.move.foulplay=Vuil spel
-pokemob.move.simplebeam=Simpele straal
-pokemob.move.entrainment=Troon mee
-pokemob.move.afteryou=Na u
-pokemob.move.round=Ronde stem
-pokemob.move.echoedvoice=Echostem
-pokemob.move.chipaway=Hak af
-pokemob.move.clearsmog=Heldere smog
-pokemob.move.storedpower=Opgeslagen kracht
-pokemob.move.quickguard=Snelle verdediging
-pokemob.move.allyswitch=Bondgenootswissel
-pokemob.move.scald=Heet water
-pokemob.move.shellsmash=Schelpuitbraak
-pokemob.move.healpulse=Genezingspuls
-pokemob.move.hex=Bezwering
-pokemob.move.skydrop=Luchtdropping
-pokemob.move.shiftgear=Schakel
-pokemob.move.circlethrow=Cirkelworp
-pokemob.move.incinerate=Veras
-pokemob.move.quash=Verpletter
-pokemob.move.acrobatics=Acrobatiek
-pokemob.move.reflecttype=Reflecteer type
-pokemob.move.retaliate=Sla terug
-pokemob.move.finalgambit=Laatste zet
-pokemob.move.bestow=Schenken
-pokemob.move.inferno=Inferno
-pokemob.move.waterpledge=Watereed
-pokemob.move.firepledge=Vuureed
-pokemob.move.grasspledge=Graseed
-pokemob.move.voltswitch=Voltwissel
-pokemob.move.strugglebug=Worstelinsect
-pokemob.move.bulldoze=Platwals
-pokemob.move.frostbreath=Vorstadem
-pokemob.move.dragontail=Drakenstaart
-pokemob.move.workup=Opvrolijking
-pokemob.move.electroweb=Elektroweb
-pokemob.move.wildcharge=Wilde aanval
-pokemob.move.drillrun=Drilloop
-pokemob.move.dualchop=Tweevoudige slag
-pokemob.move.heartstamp=Hartstempel
-pokemob.move.hornleech=Hoornzuiger
-pokemob.move.sacredsword=Heilig zwaard
-pokemob.move.razorshell=Scheerschelp
-pokemob.move.heatcrash=Hittecrash
-pokemob.move.leaftornado=Bladtornado
-pokemob.move.steamroller=Stoomwals
-pokemob.move.cottonguard=Katoenschild
-pokemob.move.nightdaze=Nachtverdoving
-pokemob.move.psystrike=Psystoot
-pokemob.move.tailslap=Staartmep
-pokemob.move.hurricane=Orkaan
-pokemob.move.headcharge=Hoofdaanval
-pokemob.move.geargrind=Tandwielgemaal
-pokemob.move.searingshot=Hitteschot
-pokemob.move.technoblast=Technostoot
-pokemob.move.relicsong=Relieklied
-pokemob.move.secretsword=Geheim zwaard
-pokemob.move.glaciate=Poolvlakte
-pokemob.move.boltstrike=Schichtstoot
-pokemob.move.blueflare=Blauwe vlam
-pokemob.move.fierydance=Vurige dans
-pokemob.move.freezeshock=Vriesschok
-pokemob.move.iceburn=Vriesbrand
-pokemob.move.snarl=Grauw
-pokemob.move.iciclecrash=Ijspegelcrash
-pokemob.move.vcreate=V-creëer
-pokemob.move.fusionflare=Fusievlam
-pokemob.move.fusionbolt=Fusieschicht
-pokemob.move.flyingpress=Vliegende wals
-pokemob.move.matblock=Mat-blokkeer
-pokemob.move.belch=Boer
-pokemob.move.rototiller=Ploeg
-pokemob.move.stickyweb=Plakkerig web
-pokemob.move.fellstinger=Wrede angel
-pokemob.move.phantomforce=Fantoomkracht
-pokemob.move.trickortreat=Snoep of je leven #Haloween expression in Dutch
-pokemob.move.nobleroar=Nobele brul
-pokemob.move.iondeluge=Ionenstortvloed
-pokemob.move.paraboliccharge=Parabolische lading
-pokemob.move.forestscurse=Vloek des wouds
-pokemob.move.petalblizzard=Bloemenstorm
-pokemob.move.freezedry=Vriesdroog
-pokemob.move.disarmingvoice=Ontwapenende stem
-pokemob.move.partingshot=Verstrooischot
-pokemob.move.topsyturvy=Ondersteboven
-pokemob.move.drainingkiss=Onttrekkende kus
-pokemob.move.craftyshield=Listig schild
-pokemob.move.flowershield=Bloemenschild
-pokemob.move.grassyterrain=Grassig terrein
-pokemob.move.mistyterrain=Mistig terrein
-pokemob.move.electrify=Elektrificeer
-pokemob.move.playrough=Speel ruig
-pokemob.move.fairywind=Feeënwind
-pokemob.move.moonblast=Maanschot
-pokemob.move.boomburst=Boemstoot
-pokemob.move.fairylock=Feeënslot
-pokemob.move.kingsshield=Koningsschild
-pokemob.move.playnice=Gedraag je
-pokemob.move.confide=Deel geheim
-pokemob.move.diamondstorm=Diamantstorm
-pokemob.move.steameruption=Stoomuitbarsting
-pokemob.move.hyperspacehole=Dimensionaal gat
-pokemob.move.watershuriken=Waterwerpster
-pokemob.move.mysticalfire=Mystiek vuur
-pokemob.move.spikyshield=Stekelig schild
-pokemob.move.aromaticmist=Geurige mist
-pokemob.move.eerieimpulse=Griezelige drang
-pokemob.move.venomdrench=Gif-doorweek
-pokemob.move.powder=Poeder
-pokemob.move.geomancy=Aardbeheersing
-pokemob.move.magneticflux=Magnetische stroom
-pokemob.move.happyhour=Blij uur
-pokemob.move.electricterrain=Elektrisch terrein 
-pokemob.move.dazzlinggleam=Schitterende glans
-pokemob.move.celebrate=Vier feest
-pokemob.move.holdhands=Handen vasthouden
-pokemob.move.babydolleyes=Baby-poppenogen
-pokemob.move.nuzzle=Wang-wrijf
-pokemob.move.holdback=Rustig aan
-pokemob.move.infestation=Plaag
-pokemob.move.poweruppunch=Power-upslag
-pokemob.move.oblivionwing=Vergetelheidvleugel
-pokemob.move.thousandarrows=Duizend pijlen
-pokemob.move.thousandwaves=Duizend golven
-pokemob.move.landswrath=Wraak des lands
-pokemob.move.lightofruin=Licht des ondergangs
-pokemob.move.originpulse=Oorsprong puls
-pokemob.move.precipiceblades=Klifklingen
-pokemob.move.dragonascent=Drakenklim
-pokemob.move.hyperspacefury=Dimensionale razernij
diff --git a/src/main/resources/assets/pokecube_moves/lang/pt_BR.lang b/src/main/resources/assets/pokecube_moves/lang/pt_BR.lang
deleted file mode 100644
index 1af9f0952b..0000000000
--- a/src/main/resources/assets/pokecube_moves/lang/pt_BR.lang
+++ /dev/null
@@ -1,670 +0,0 @@
-#Pokecube translation
-
-##Move Messages
-
-pokemob.move.super.effective=É superefetivo!
-pokemob.move.not.very.effective=Não é tão efetivo!
-pokemob.move.doesnt.affect=Não afeta %1$s!
-pokemob.move.critical.hit=Golpe crítico!
-pokemob.move.used=%1$s usou %2$s!
-pokemob.move.enemyUsed=%1$s inimigo usou %2$s!
-pokemob.move.stat.fail=Mas falhou
-pokemob.move.stat.rise1=%2$s de %1$s aumentou
-pokemob.move.stat.rise2=%2$s de %1$s aumentou bruscamente
-pokemob.move.stat.rise3=%2$s de %1$s aumentou enormemente
-pokemob.move.stat.fall1=%2$s de %1$s diminuiu
-pokemob.move.stat.fall2=%2$s de %1$s diminuiu rudemente
-pokemob.move.stat.fall3=%2$s de %1$s diminuiu drasticamente
-
-pokemob.move.stat1=Ataque
-pokemob.move.stat2=Defesa
-pokemob.move.stat3=Ataque Especial
-pokemob.move.stat4=Defesa Especial
-pokemob.move.stat5=Velocidade
-pokemob.move.stat6=Precisão
-pokemob.move.stat7=Evasão
-
-pokemob.move.notify.learn=%1$s aprendeu %2$s
-pokemob.move.terraindamage=%1$s sofreu danos por %2$s
-
-pokemob.move.missed.ours=§cNão acertou %1$s!
-pokemob.move.missed.theirs=§aNão acertou %1$s!
-
-pokemob.move.failed.ours=%1$s's §cataque falhou!
-pokemob.move.failed.theirs=%1$s's §aataque falhou!
-
-pokemob.move.isfrozen=%1$s está sob o efeito de congelamento.
-pokemob.move.issleeping=%1$s está dormindo.
-pokemob.move.isfullyparalyzed=%1$s está totalmente sob o efeito de paralisia.
-pokemob.move.paralyzed=%1$s está sob o efeito de paralisia.
-pokemob.move.isburned=%1$s está sob o efeito de queimadura.
-pokemob.move.ispoisoned=%1$s está sob o efeito de envenenamento.
-pokemob.move.isbadlypoisoned=%1$s está sob o efeito de envenenamento severo.
-
-pokemob.move.sketched=%1$s esboçado %2$s
-
-pokemob.move.cooldown=%1$s §cnão pode usar %2$s §cagora.
-
-##Move Names
-
-pokemob.move.pound=Pancada (Pound)
-pokemob.move.karatechop=Corte Karatê (Karate Chop)
-pokemob.move.doubleslap=Duplo Tapa (Double Slap)
-pokemob.move.cometpunch=Soco Cometa (Comet Punch)
-pokemob.move.megapunch=Megassoco (Mega Punch)
-pokemob.move.payday=Dia do Pagamento (Pay Day)
-pokemob.move.firepunch=Soco de Fogo (Fire Punch)
-pokemob.move.icepunch=Soco de Gelo (Ice Punch)
-pokemob.move.thunderpunch=Soco Trovão (Thunder Punch)
-pokemob.move.scratch=Arranhão (Scratch)
-pokemob.move.vicegrip=Pinça Prensa (Vice Grip)
-pokemob.move.guillotine=Guilhotina (Guillotine)
-pokemob.move.razorwind=Vento Navalha (Razor Wind)
-pokemob.move.swordsdance=Dança das Espadas (Swords Dance)
-pokemob.move.cut=Corte (Cut)
-pokemob.move.gust=Rajada de Vento (Gust)
-pokemob.move.wingattack=Ataque de Asa (Wing Attack)
-pokemob.move.whirlwind=Turbilhão (Whirlwind)
-pokemob.move.fly=Voo (Fly)
-pokemob.move.bind=Amarrar (Bind)
-pokemob.move.slam=Batida (Slam)
-pokemob.move.vinewhip=Chicote de Vinha (Vine Whip)
-pokemob.move.stomp=Pisada (Stomp)
-pokemob.move.doublekick=Chute Duplo (Double Kick)
-pokemob.move.megakick=Megachute (Mega Kick)
-pokemob.move.jumpkick=Voadora (Jump Kick)
-pokemob.move.rollingkick=Chute Rolante (Rolling Kick)
-pokemob.move.sandattack=Ataque de Areia (Sand Attack)
-pokemob.move.headbutt=Cabeçada (Headbutt)
-pokemob.move.hornattack=Ataque de Chifre (Horn Attack)
-pokemob.move.furyattack=Ataque de Fúria (Fury Attack)
-pokemob.move.horndrill=Chifre Broca (Horn Drill)
-pokemob.move.tackle=Investida (Tackle)
-pokemob.move.bodyslam=Queda de Corpo (Body Slam)
-pokemob.move.wrap=Envolver (Wrap)
-pokemob.move.takedown=Derrubada (Take Down)
-pokemob.move.thrash=Surrar (Thrash)
-pokemob.move.doubleedge=Lâmina Dupla (Double-Edge)
-pokemob.move.tailwhip=Cauda Chicote (Tail Whip)
-pokemob.move.poisonsting=Ferrão Venenoso (Poison Sting)
-pokemob.move.twineedle=Agulhas Gêmeas (Twineedle)
-pokemob.move.pinmissile=Míssil de Espinhos (Pin Missile)
-pokemob.move.leer=Olhar Malicioso (Leer)
-pokemob.move.bite=Mordida (Bite)
-pokemob.move.growl=Rosnar (Growl)
-pokemob.move.roar=Rugido (Roar)
-pokemob.move.sing=Cantar (Sing)
-pokemob.move.supersonic=Supersônico (Supersonic)
-pokemob.move.sonicboom=Ruído Sônico (Sonic Boom)
-pokemob.move.disable=Desabilitar (Disable)
-pokemob.move.acid=Ácido (Acid)
-pokemob.move.ember=Brasa (Ember)
-pokemob.move.flamethrower=Lança-Chamas (Flamethrower)
-pokemob.move.mist=Névoa (Mist)
-pokemob.move.watergun=Arma de Água (Water Gun)
-pokemob.move.hydropump=Hidrobomba (Hydro Pump)
-pokemob.move.surf=Surfar (Surf)
-pokemob.move.icebeam=Raio de Gelo (Ice Beam)
-pokemob.move.blizzard=Nevasca (Blizzard)
-pokemob.move.psybeam=Raio Psíquico (Psybeam)
-pokemob.move.bubblebeam=Raio de Bolhas (Bubble Beam)
-pokemob.move.aurorabeam=Raio Aurora (Aurora Beam)
-pokemob.move.hyperbeam=Hiper-Raio (Hyper Beam)
-pokemob.move.peck=Bicada (Peck)
-pokemob.move.drillpeck=Bico Broca (Drill Peck)
-pokemob.move.submission=Submissão (Submission)
-pokemob.move.lowkick=Chute Baixo (Low Kick)
-pokemob.move.counter=Contra-Ataque (Counter)
-pokemob.move.seismictoss=Arremesso Sísmico (Seismic Toss)
-pokemob.move.strength=Força (Strength)
-pokemob.move.absorb=Absorver (Absorb)
-pokemob.move.megadrain=Megadreno (Mega Drain)
-pokemob.move.leechseed=Semente Sanguessuga (Leech Seed)
-pokemob.move.growth=Crescimento (Growth)
-pokemob.move.razorleaf=Folha Navalha (Razor Leaf)
-pokemob.move.solarbeam=Raio Solar (Solar Beam)
-pokemob.move.poisonpowder=Pó Venenoso (Poison Powder)
-pokemob.move.stunspore=Esporo Paralizante (Stun Spore)
-pokemob.move.sleeppowder=Pó do Sono (Sleep Powder)
-pokemob.move.petaldance=Dança das Pétalas (Petal Dance)
-pokemob.move.stringshot=Tiro de Estilingue (String Shot)
-pokemob.move.dragonrage=Fúria de Dragão (Dragon Rage)
-pokemob.move.firespin=Giro de Fogo (Fire Spin)
-pokemob.move.thundershock=Choque do Trovão (Thunder Shock)
-pokemob.move.thunderbolt=Relâmpago do Trovão (Thunderbolt)
-pokemob.move.thunderwave=Onda Trovão (Thunder Wave)
-pokemob.move.thunder=Trovão (Thunder)
-pokemob.move.rockthrow=Arremesso de Rocha (Rock Throw)
-pokemob.move.earthquake=Terremoto (Earthquake)
-pokemob.move.fissure=Fissura (Fissure)
-pokemob.move.dig=Cavar (Dig)
-pokemob.move.toxic=Tóxico (Toxic)
-pokemob.move.confusion=Confusão (Confusion)
-pokemob.move.psychic=Psíquico (Psychic)
-pokemob.move.hypnosis=Hipnose (Hypnosis)
-pokemob.move.meditate=Meditar (Meditate)
-pokemob.move.agility=Agilidade (Agility)
-pokemob.move.quickattack=Ataque Rápido (Quick Attack)
-pokemob.move.rage=Raiva (Rage)
-pokemob.move.teleport=Teletransporte (Teleport)
-pokemob.move.nightshade=Sombra Noturna (Night Shade)
-pokemob.move.mimic=Mímica (Mimic)
-pokemob.move.screech=Berro (Screech)
-pokemob.move.doubleteam=Time Duplo (Double Team)
-pokemob.move.recover=Recuperar (Recover)
-pokemob.move.harden=Endurecer (Harden)
-pokemob.move.minimize=Minimizar (Minimize)
-pokemob.move.smokescreen=Cortina de Fumaça (Smokescreen)
-pokemob.move.confuseray=Raio de Confusão (Confuse Ray)
-pokemob.move.withdraw=Retirada (Withdraw)
-pokemob.move.defensecurl=Defesa Encaracolada (Defense Curl)
-pokemob.move.barrier=Barreira (Barrier)
-pokemob.move.lightscreen=Tela de Luz (Light Screen)
-pokemob.move.haze=Neblina (Haze)
-pokemob.move.reflect=Refletir (Reflect)
-pokemob.move.focusenergy=Energia Focalizada (Focus Energy)
-pokemob.move.bide=Tolerar (Bide)
-pokemob.move.metronome=Metrônomo (Metronome)
-pokemob.move.mirrormove=Movimento Espelhado (Mirror Move)
-pokemob.move.selfdestruct=Autodestruição (Self-Destruct)
-pokemob.move.eggbomb=Ovo Bomba (Egg Bomb)
-pokemob.move.lick=Lambida (Lick)
-pokemob.move.smog=Fumaça (Smog)
-pokemob.move.sludge=Lodo (Sludge)
-pokemob.move.boneclub=Sabre de Osso (Bone Club)
-pokemob.move.fireblast=Explosão de Fogo (Fire Blast)
-pokemob.move.waterfall=Cascata (Waterfall)
-pokemob.move.clamp=Apertar (Clamp)
-pokemob.move.swift=Estrela Cadente (Swift)
-pokemob.move.skullbash=Esmaga-Crânio (Skull Bash)
-pokemob.move.spikecannon=Canhão de Espinhos (Spike Cannon)
-pokemob.move.constrict=Constringir (Constrict)
-pokemob.move.amnesia=Amnésia (Amnesia)
-pokemob.move.kinesis=Cinese (Kinesis)
-pokemob.move.softboiled=Sentimental (Soft-Boiled)
-pokemob.move.highjumpkick=Voadora Alta (High Jump Kick)
-pokemob.move.glare=Olhar Penetrante (Glare)
-pokemob.move.dreameater=Comedor de Sonhos (Dream Eater)
-pokemob.move.poisongas=Gás Venenoso (Poison Gas)
-pokemob.move.barrage=Bombardeio (Barrage)
-pokemob.move.leechlife=Ataque Sanguessuga (Leech Life)
-pokemob.move.lovelykiss=Beijo Encantador (Lovely Kiss)
-pokemob.move.skyattack=Ataque do Céu (Sky Attack)
-pokemob.move.transform=Transformar (Transform)
-pokemob.move.bubble=Bolhas (Bubble)
-pokemob.move.dizzypunch=Soco Atordoante (Dizzy Punch)
-pokemob.move.spore=Esporos (Spore)
-pokemob.move.flash=Clarão (Flash)
-pokemob.move.psywave=Onda Psíquica (Psywave)
-pokemob.move.splash=Espirrar (Splash)
-pokemob.move.acidarmor=Armadura Ácida (Acid Armor)
-pokemob.move.crabhammer=Martelo Caranguejo (Crabhammer)
-pokemob.move.explosion=Explosão (Explosion)
-pokemob.move.furyswipes=Batedores de Fúria (Fury Swipes)
-pokemob.move.bonemerang=Ossomerangue (Bonemerang)
-pokemob.move.rest=Descansar (Rest)
-pokemob.move.rockslide=Deslize de Rocha (Rock Slide)
-pokemob.move.hyperfang=Hiperpresa (Hyper Fang)
-pokemob.move.sharpen=Afiar (Sharpen)
-pokemob.move.conversion=Conversão (Conversion)
-pokemob.move.triattack=Triataque (Tri Attack)
-pokemob.move.superfang=Superpresa (Super Fang)
-pokemob.move.slash=Talhada (Slash)
-pokemob.move.substitute=Substituto (Substitute)
-pokemob.move.struggle=Esforço (Struggle)
-pokemob.move.sketch=Esboço (Sketch)
-pokemob.move.triplekick=Chute Triplo (Triple Kick)
-pokemob.move.thief=Ladrão (Thief)
-pokemob.move.spiderweb=Teia de Aranha (Spider Web)
-pokemob.move.mindreader=Leitor de Mente (Mind Reader)
-pokemob.move.nightmare=Pesadelo (Nightmare)
-pokemob.move.flamewheel=Roda de Fogo (Flame Wheel)
-pokemob.move.snore=Ronco (Snore)
-pokemob.move.curse=Maldição (Curse)
-pokemob.move.flail=Malhar (Flail)
-pokemob.move.conversion2=Conversão 2 (Conversion 2)
-pokemob.move.aeroblast=Aeroexplosão (Aeroblast)
-pokemob.move.cottonspore=Esporo de Algodão (Cotton Spore)
-pokemob.move.reversal=Reversão (Reversal)
-pokemob.move.spite=Irritar (Spite)
-pokemob.move.powdersnow=Neve em Pó (Powder Snow)
-pokemob.move.protect=Proteção (Protect)
-pokemob.move.machpunch=Soco Mach (Mach Punch)
-pokemob.move.scaryface=Cara Assustadora (Scary Face)
-pokemob.move.feintattack=Ataque Dissimulado (Feint Attack)
-pokemob.move.sweetkiss=Beijo Doce (Sweet Kiss)
-pokemob.move.bellydrum=Barriga Tambor (Belly Drum)
-pokemob.move.sludgebomb=Bomba de Lodo (Sludge Bomb)
-pokemob.move.mudslap=Bofetada de Lama (Mud-Slap)
-pokemob.move.octazooka=Octozuka (Octazooka)
-pokemob.move.spikes=Espinhos (Spikes)
-pokemob.move.zapcannon=Canhão Destruidor (Zap Cannon)
-pokemob.move.foresight=Previdência (Foresight)
-pokemob.move.destinybond=Elo do Destino (Destiny Bond)
-pokemob.move.perishsong=Canção do Perecimento (Perish Song)
-pokemob.move.icywind=Vento Gélido (Icy Wind)
-pokemob.move.detect=Detectar (Detect)
-pokemob.move.bonerush=Ataque de Ossos (Bone Rush)
-pokemob.move.lockon=Mirar (Lock-On)
-pokemob.move.outrage=Ultraje (Outrage)
-pokemob.move.sandstorm=Tempestade de Areia (Sandstorm)
-pokemob.move.gigadrain=Gigadreno (Giga Drain)
-pokemob.move.endure=Suportar (Endure)
-pokemob.move.charm=Charme (Charm)
-pokemob.move.rollout=Rolamento (Rollout)
-pokemob.move.falseswipe=Golpe Falso (False Swipe)
-pokemob.move.swagger=Pretensão (Swagger)
-pokemob.move.milkdrink=Beber Leite (Milk Drink)
-pokemob.move.spark=Faísca (Spark)
-pokemob.move.furycutter=Cortadores de Fúria (Fury Cutter)
-pokemob.move.steelwing=Asa de Aço (Steel Wing)
-pokemob.move.meanlook=Olhar Vil (Mean Look)
-pokemob.move.attract=Atração (Attract)
-pokemob.move.sleeptalk=Sonambulismo (Sleep Talk)
-pokemob.move.healbell=Sino Restaurador (Heal Bell)
-pokemob.move.return=Retorno (Return)
-pokemob.move.present=Presente (Present)
-pokemob.move.frustration=Frustração (Frustration)
-pokemob.move.safeguard=Salvaguarda (Safeguard)
-pokemob.move.painsplit=Dividir Dor (Pain Split)
-pokemob.move.sacredfire=Fogo Sagrado (Sacred Fire)
-pokemob.move.magnitude=Magnitude (Magnitude)
-pokemob.move.dynamicpunch=Soco Dinâmico (Dynamic Punch)
-pokemob.move.megahorn=Megachifre (Megahorn)
-pokemob.move.dragonbreath=Sopro de Dragão (Dragon Breath)
-pokemob.move.batonpass=Revezar (Baton Pass)
-pokemob.move.encore=Bis (Encore)
-pokemob.move.pursuit=Perseguição (Pursuit)
-pokemob.move.rapidspin=Giro Rápido (Rapid Spin)
-pokemob.move.sweetscent=Aroma Doce (Sweet Scent)
-pokemob.move.irontail=Cauda de Ferro (Iron Tail)
-pokemob.move.metalclaw=Garra de Metal (Metal Claw)
-pokemob.move.vitalthrow=Arremesso Vital (Vital Throw)
-pokemob.move.morningsun=Sol da Manhã (Morning Sun)
-pokemob.move.synthesis=Síntese (Synthesis)
-pokemob.move.moonlight=Luar (Moonlight)
-pokemob.move.hiddenpower=Poder Oculto (Hidden Power)
-pokemob.move.crosschop=Corte Cruzado (Cross Chop)
-pokemob.move.twister=Ciclone (Twister)
-pokemob.move.raindance=Dança da Chuva (Rain Dance)
-pokemob.move.sunnyday=Dia Ensolarado (Sunny Day)
-pokemob.move.crunch=Triturar (Crunch)
-pokemob.move.mirrorcoat=Manto Reflexivo (Mirror Coat)
-pokemob.move.psychup=Concentração (Psych Up)
-pokemob.move.extremespeed=Velocidade Extrema (Extreme Speed)
-pokemob.move.ancientpower=Poder Antigo (Ancient Power)
-pokemob.move.shadowball=Esfera Escura (Shadow Ball)
-pokemob.move.futuresight=Visão Futura (Future Sight)
-pokemob.move.rocksmash=Esmagamento de Rocha (Rock Smash)
-pokemob.move.whirlpool=Redemoinho (Whirlpool)
-pokemob.move.beatup=Espancar (Beat Up)
-pokemob.move.fakeout=Saída Falsa (Fake Out)
-pokemob.move.uproar=Tumultuar (Uproar)
-pokemob.move.stockpile=Estocar (Stockpile)
-pokemob.move.spitup=Cuspir (Spit Up)
-pokemob.move.swallow=Engolir (Swallow)
-pokemob.move.heatwave=Onda de Calor (Heat Wave)
-pokemob.move.hail=Granizo (Hail)
-pokemob.move.torment=Atormentar (Torment)
-pokemob.move.flatter=Bajular (Flatter)
-pokemob.move.willowisp=Fogo-Fátuo (Will-O-Wisp)
-pokemob.move.memento=Lembrança (Memento)
-pokemob.move.facade=Fachada (Facade)
-pokemob.move.focuspunch=Soco Focalizado (Focus Punch)
-pokemob.move.smellingsalts=Sais Aromáticos (Smelling Salts)
-pokemob.move.followme=Siga-Me (Follow Me)
-pokemob.move.naturepower=Poder Natural (Nature Power)
-pokemob.move.charge=Carga (Charge)
-pokemob.move.taunt=Provocação (Taunt)
-pokemob.move.helpinghand=Mão Amiga (Helping Hand)
-pokemob.move.trick=Enganar (Trick)
-pokemob.move.roleplay=Encenação (Role Play)
-pokemob.move.wish=Desejo (Wish)
-pokemob.move.assist=Assistência (Assist)
-pokemob.move.ingrain=Enraizar (Ingrain)
-pokemob.move.superpower=Superpoder (Superpower)
-pokemob.move.magiccoat=Manto Mágico (Magic Coat)
-pokemob.move.recycle=Reciclar (Recycle)
-pokemob.move.revenge=Vingança (Revenge)
-pokemob.move.brickbreak=Quebra-Telha (Brick Break)
-pokemob.move.yawn=Bocejo (Yawn)
-pokemob.move.knockoff=Desarmar (Knock Off)
-pokemob.move.endeavor=Empenho (Endeavor)
-pokemob.move.eruption=Erupção (Eruption)
-pokemob.move.skillswap=Troca Habilidades (Skill Swap)
-pokemob.move.imprison=Aprisionar (Imprison)
-pokemob.move.refresh=Revigorar (Refresh)
-pokemob.move.grudge=Rancor (Grudge)
-pokemob.move.snatch=Rapto (Snatch)
-pokemob.move.secretpower=Poder Secreto (Secret Power)
-pokemob.move.dive=Mergulho (Dive)
-pokemob.move.armthrust=Empurrão de Braço (Arm Thrust)
-pokemob.move.camouflage=Camuflagem (Camouflage)
-pokemob.move.tailglow=Brilho de Cauda (Tail Glow)
-pokemob.move.lusterpurge=Purificação Esplendorosa (Luster Purge)
-pokemob.move.mistball=Esfera de Névoa (Mist Ball)
-pokemob.move.featherdance=Dança das Plumas (Feather Dance)
-pokemob.move.teeterdance=Dança do Balanço (Teeter Dance)
-pokemob.move.blazekick=Chute Flamejante (Blaze Kick)
-pokemob.move.mudsport=Esporte de Lama (Mud Sport)
-pokemob.move.iceball=Bola de Gelo (Ice Ball)
-pokemob.move.needlearm=Braço de Espinhos (Needle Arm)
-pokemob.move.slackoff=Relaxar (Slack Off)
-pokemob.move.hypervoice=Hipervoz (Hyper Voice)
-pokemob.move.poisonfang=Presa Venenosa (Poison Fang)
-pokemob.move.crushclaw=Garra Esmagadora (Crush Claw)
-pokemob.move.blastburn=Queima Explosiva (Blast Burn)
-pokemob.move.hydrocannon=Hidrocanhão (Hydro Cannon)
-pokemob.move.meteormash=Meteoro Esmagador (Meteor Mash)
-pokemob.move.astonish=Assombrar (Astonish)
-pokemob.move.weatherball=Esfera Climática (Weather Ball)
-pokemob.move.aromatherapy=Aromaterapia (Aromatherapy)
-pokemob.move.faketears=Lágrimas de Crocodilo (Fake Tears)
-pokemob.move.aircutter=Cortadores de Ar (Air Cutter)
-pokemob.move.overheat=Superaquecimento (Overheat)
-pokemob.move.odorsleuth=Farejar (Odor Sleuth)
-pokemob.move.rocktomb=Túmulo de Rocha (Rock Tomb)
-pokemob.move.silverwind=Vento de Prata (Silver Wind)
-pokemob.move.metalsound=Som Metálico (Metal Sound)
-pokemob.move.grasswhistle=Apito de Grama (Grass Whistle)
-pokemob.move.tickle=Cócegas (Tickle)
-pokemob.move.cosmicpower=Poder Cósmico (Cosmic Power)
-pokemob.move.waterspout=Esguicho de Água (Water Spout)
-pokemob.move.signalbeam=Raio Sinalizador (Signal Beam)
-pokemob.move.shadowpunch=Soco Sombrio (Shadow Punch)
-pokemob.move.extrasensory=Extrassensorial (Extrasensory)
-pokemob.move.skyuppercut=Golpe do Céu (Sky Uppercut)
-pokemob.move.sandtomb=Túmulo de Areia (Sand Tomb)
-pokemob.move.sheercold=Frio Absoluto (Sheer Cold)
-pokemob.move.muddywater=Água Lamacenta (Muddy Water)
-pokemob.move.bulletseed=Rajada de Sementes (Bullet Seed)
-pokemob.move.aerialace=Ás Aéreo (Aerial Ace)
-pokemob.move.iciclespear=Sincelos-Lança (Icicle Spear)
-pokemob.move.irondefense=Defesa de Ferro (Iron Defense)
-pokemob.move.block=Bloqueio (Block)
-pokemob.move.howl=Uivo (Howl)
-pokemob.move.dragonclaw=Garra de Dragão (Dragon Claw)
-pokemob.move.frenzyplant=Plantas Frenéticas (Frenzy Plant)
-pokemob.move.bulkup=Aumento de Massa (Bulk Up)
-pokemob.move.bounce=Salto (Bounce)
-pokemob.move.mudshot=Tiro de Lama (Mud Shot)
-pokemob.move.poisontail=Cauda Venenosa (Poison Tail)
-pokemob.move.covet=Cobiça (Covet)
-pokemob.move.volttackle=Investida Trovão (Volt Tackle)
-pokemob.move.magicalleaf=Folhas Mágicas (Magical Leaf)
-pokemob.move.watersport=Esporte Aquático (Water Sport)
-pokemob.move.calmmind=Mente Calma (Calm Mind)
-pokemob.move.leafblade=Lâmina de Folha (Leaf Blade)
-pokemob.move.dragondance=Dança de Dragão (Dragon Dance)
-pokemob.move.rockblast=Rajada de Rochas (Rock Blast)
-pokemob.move.shockwave=Onda de Choque (Shock Wave)
-pokemob.move.waterpulse=Pulso de Água (Water Pulse)
-pokemob.move.doomdesire=Desejo Destrutivo (Doom Desire)
-pokemob.move.psychoboost=Impulso Psíquico (Psycho Boost)
-pokemob.move.roost=Pousar (Roost)
-pokemob.move.gravity=Gravidade (Gravity)
-pokemob.move.miracleeye=Olho Milagroso (Miracle Eye)
-pokemob.move.wakeupslap=Tapa Despertador (Wake-Up Slap)
-pokemob.move.hammerarm=Braço Martelo (Hammer Arm)
-pokemob.move.gyroball=Giro Bola (Gyro Ball)
-pokemob.move.healingwish=Desejo de Cura (Healing Wish)
-pokemob.move.brine=Salmoura (Brine)
-pokemob.move.naturalgift=Presente Natural (Natural Gift)
-pokemob.move.feint=Simulação (Feint)
-pokemob.move.pluck=Arrancar (Pluck)
-pokemob.move.tailwind=Vento de Cauda (Tailwind)
-pokemob.move.acupressure=Acupressão (Acupressure)
-pokemob.move.metalburst=Estouro Metálico (Metal Burst)
-pokemob.move.uturn=Re-Turno (U-turn)
-pokemob.move.closecombat=Combate Próximo (Close Combat)
-pokemob.move.payback=Retribuir (Payback)
-pokemob.move.assurance=Assegurar (Assurance)
-pokemob.move.embargo=Impedir (Embargo)
-pokemob.move.fling=Arremessar (Fling)
-pokemob.move.psychoshift=Troca Psíquica (Psycho Shift)
-pokemob.move.trumpcard=Carta Trunfo (Trump Card)
-pokemob.move.healblock=Bloqueio de Cura (Heal Block)
-pokemob.move.wringout=Espremer (Wring Out)
-pokemob.move.powertrick=Truque de Poder (Power Trick)
-pokemob.move.gastroacid=Gastroácido (Gastro Acid)
-pokemob.move.luckychant=Cântico da Sorte (Lucky Chant)
-pokemob.move.mefirst=Eu Primeiro (Me First)
-pokemob.move.copycat=Imitar (Copycat)
-pokemob.move.powerswap=Troca de Poderes (Power Swap)
-pokemob.move.guardswap=Troca de Guardas (Guard Swap)
-pokemob.move.punishment=Punição (Punishment)
-pokemob.move.lastresort=Último Recurso (Last Resort)
-pokemob.move.worryseed=Semente da Preocupação (Worry Seed)
-pokemob.move.suckerpunch=Soco Aproveitador (Sucker Punch)
-pokemob.move.toxicspikes=Espinhos Tóxicos (Toxic Spikes)
-pokemob.move.heartswap=Troca de Coração (Heart Swap)
-pokemob.move.aquaring=Aqua-Anel (Aqua Ring)
-pokemob.move.magnetrise=Elevação Magnética (Magnet Rise)
-pokemob.move.flareblitz=Assalto Chamejante (Flare Blitz)
-pokemob.move.forcepalm=Repuxo (Force Palm)
-pokemob.move.aurasphere=Esfera de Aura (Aura Sphere)
-pokemob.move.rockpolish=Polimento de Rocha (Rock Polish)
-pokemob.move.poisonjab=Golpe Venenoso (Poison Jab)
-pokemob.move.darkpulse=Pulso Sombrio (Dark Pulse)
-pokemob.move.nightslash=Talhada Noturna (Night Slash)
-pokemob.move.aquatail=Cauda de Áqua (Aqua Tail)
-pokemob.move.seedbomb=Bomba de Semente (Seed Bomb)
-pokemob.move.airslash=Talhada Aérea (Air Slash)
-pokemob.move.xscissor=Corte-X (X-Scissor)
-pokemob.move.bugbuzz=Zumbido de Inseto (Bug Buzz)
-pokemob.move.dragonpulse=Pulsação de Dragão (Dragon Pulse)
-pokemob.move.dragonrush=Assalto de Dragão (Dragon Rush)
-pokemob.move.powergem=Joia do Poder (Power Gem)
-pokemob.move.drainpunch=Soco Drenagem (Drain Punch)
-pokemob.move.vacuumwave=Onda de Vácuo (Vacuum Wave)
-pokemob.move.focusblast=Explosão Focalizada (Focus Blast)
-pokemob.move.energyball=Esfera de Energia (Energy Ball)
-pokemob.move.bravebird=Fúria dos Pássaros (Brave Bird)
-pokemob.move.earthpower=Poder da Terra (Earth Power)
-pokemob.move.switcheroo=Comutar (Switcheroo)
-pokemob.move.gigaimpact=Gigaimpacto (Giga Impact)
-pokemob.move.nastyplot=Trama Maldosa (Nasty Plot)
-pokemob.move.bulletpunch=Soco Projétil (Bullet Punch)
-pokemob.move.avalanche=Avalanche (Avalanche)
-pokemob.move.iceshard=Caco de Gelo (Ice Shard)
-pokemob.move.shadowclaw=Garra das Sombras (Shadow Claw)
-pokemob.move.thunderfang=Presa Trovão (Thunder Fang)
-pokemob.move.icefang=Presa de Gelo (Ice Fang)
-pokemob.move.firefang=Presa de Fogo (Fire Fang)
-pokemob.move.shadowsneak=Sombra Furtiva (Shadow Sneak)
-pokemob.move.mudbomb=Bomba de Lama (Mud Bomb)
-pokemob.move.psychocut=Corte Psíquico (Psycho Cut)
-pokemob.move.zenheadbutt=Cabeçada Zen (Zen Headbutt)
-pokemob.move.mirrorshot=Tiro de Espelho (Mirror Shot)
-pokemob.move.flashcannon=Canhão de Luz (Flash Cannon)
-pokemob.move.rockclimb=Escalada de Rocha (Rock Climb)
-pokemob.move.defog=Desembaçar (Defog)
-pokemob.move.trickroom=Sala-Truque (Trick Room)
-pokemob.move.dracometeor=Meteoro de Dragão (Draco Meteor)
-pokemob.move.discharge=Descarga (Discharge)
-pokemob.move.lavaplume=Pluma de Lava (Lava Plume)
-pokemob.move.leafstorm=Tempestade de Folhas (Leaf Storm)
-pokemob.move.powerwhip=Chicote Poderoso (Power Whip)
-pokemob.move.rockwrecker=Destruidor de Rocha (Rock Wrecker)
-pokemob.move.crosspoison=Corte Venenoso (Cross Poison)
-pokemob.move.gunkshot=Tiro Sujo (Gunk Shot)
-pokemob.move.ironhead=Cabeçada de Ferro (Iron Head)
-pokemob.move.magnetbomb=Bomba Magnética (Magnet Bomb)
-pokemob.move.stoneedge=Pedra Afiada (Stone Edge)
-pokemob.move.captivate=Cativar (Captivate)
-pokemob.move.stealthrock=Rocha Furtiva (Stealth Rock)
-pokemob.move.grassknot=Nó de Grama (Grass Knot)
-pokemob.move.chatter=Tagarelar (Chatter)
-pokemob.move.judgment=Julgamento (Judgment)
-pokemob.move.bugbite=Mordida de Inseto (Bug Bite)
-pokemob.move.chargebeam=Raio de Carga (Charge Beam)
-pokemob.move.woodhammer=Madeira Martelo (Wood Hammer)
-pokemob.move.aquajet=Aquamíssil (Aqua Jet)
-pokemob.move.attackorder=Ordem de Ataque (Attack Order)
-pokemob.move.defendorder=Ordem de Defesa (Defend Order)
-pokemob.move.healorder=Ordem de Cura (Heal Order)
-pokemob.move.headsmash=Esmaga-Cabeça (Head Smash)
-pokemob.move.doublehit=Golpe Duplo (Double Hit)
-pokemob.move.roaroftime=Rugido do Tempo (Roar of Time)
-pokemob.move.spacialrend=Rasgo Espacial (Spacial Rend)
-pokemob.move.lunardance=Dança Lunar (Lunar Dance)
-pokemob.move.crushgrip=Aperto Esmagador (Crush Grip)
-pokemob.move.magmastorm=Tempestade de Magma (Magma Storm)
-pokemob.move.darkvoid=Vácuo Sombrio (Dark Void)
-pokemob.move.seedflare=Semente Reluzente (Seed Flare)
-pokemob.move.ominouswind=Vento Nefasto (Ominous Wind)
-pokemob.move.shadowforce=Força Sombria (Shadow Force)
-pokemob.move.honeclaws=Garras Afiadas (Hone Claws)
-pokemob.move.wideguard=Proteção Larga (Wide Guard)
-pokemob.move.guardsplit=Divitir Guarda (Guard Split)
-pokemob.move.powersplit=Dividir Poder (Power Split)
-pokemob.move.wonderroom=Sala-Maravilha (Wonder Room)
-pokemob.move.psyshock=Choque Psíquico (Psyshock)
-pokemob.move.venoshock=Choque Venenoso (Venoshock)
-pokemob.move.autotomize=Autotomizar (Autotomize)
-pokemob.move.ragepowder=Pó Enfurecedor (Rage Powder)
-pokemob.move.telekinesis=Telecinese (Telekinesis)
-pokemob.move.magicroom=Sala Mágica (Magic Room)
-pokemob.move.smackdown=Abater (Smack Down)
-pokemob.move.stormthrow=Arremesso Tempestade (Storm Throw)
-pokemob.move.flameburst=Estouro de Chama (Flame Burst)
-pokemob.move.sludgewave=Onda de Lodo (Sludge Wave)
-pokemob.move.quiverdance=Dança Palpitante (Quiver Dance)
-pokemob.move.heavyslam=Batida Pesada (Heavy Slam)
-pokemob.move.synchronoise=Sincrovoz (Synchronoise)
-pokemob.move.electroball=Esfera Elétrica (Electro Ball)
-pokemob.move.soak=Encharcar (Soak)
-pokemob.move.flamecharge=Carga de Chama (Flame Charge)
-pokemob.move.coil=Enrolar (Coil)
-pokemob.move.lowsweep=Golpe Baixo (Low Sweep)
-pokemob.move.acidspray=Spray Ácido (Acid Spray)
-pokemob.move.foulplay=Jogo Sujo (Foul Play)
-pokemob.move.simplebeam=Raio Simples (Simple Beam)
-pokemob.move.entrainment=Entrosamento (Entrainment)
-pokemob.move.afteryou=Depois de Você (After You)
-pokemob.move.round=Roda (Round)
-pokemob.move.echoedvoice=Voz Ecoada (Echoed Voice)
-pokemob.move.chipaway=Tirar Lasca (Chip Away)
-pokemob.move.clearsmog=Fumaça Límpida (Clear Smog)
-pokemob.move.storedpower=Poder Armazenado (Stored Power)
-pokemob.move.quickguard=Proteção Rápida (Quick Guard)
-pokemob.move.allyswitch=Troca de Aliado (Ally Switch)
-pokemob.move.scald=Escaldar (Scald)
-pokemob.move.shellsmash=Quebra de Casco (Shell Smash)
-pokemob.move.healpulse=Pulso Restaurador (Heal Pulse)
-pokemob.move.hex=Feitiço (Hex)
-pokemob.move.skydrop=Descida Celeste (Sky Drop)
-pokemob.move.shiftgear=Troca de Engrenagem (Shift Gear)
-pokemob.move.circlethrow=Arremesso Circular (Circle Throw)
-pokemob.move.incinerate=Incinerar (Incinerate)
-pokemob.move.quash=Suprimir (Quash)
-pokemob.move.acrobatics=Acrobacias (Acrobatics)
-pokemob.move.reflecttype=Tipo Reflexo (Reflect Type)
-pokemob.move.retaliate=Retaliação (Retaliate)
-pokemob.move.finalgambit=Gambito Final (Final Gambit)
-pokemob.move.bestow=Conceder (Bestow)
-pokemob.move.inferno=Inferno (Inferno)
-pokemob.move.waterpledge=Sinal de Água (Water Pledge)
-pokemob.move.firepledge=Sinal de Fogo (Fire Pledge)
-pokemob.move.grasspledge=Sinal de Grama (Grass Pledge)
-pokemob.move.voltswitch=Troca Elétrica (Volt Switch)
-pokemob.move.strugglebug=Esforço de Inseto (Struggle Bug)
-pokemob.move.bulldoze=Devastar (Bulldoze)
-pokemob.move.frostbreath=Sopro Gelado (Frost Breath)
-pokemob.move.dragontail=Cauda de Dragão (Dragon Tail)
-pokemob.move.workup=Estímulo (Work Up)
-pokemob.move.electroweb=Teia Elétrica (Electroweb)
-pokemob.move.wildcharge=Carga Selvagem (Wild Charge)
-pokemob.move.drillrun=Ataque Furadeira (Drill Run)
-pokemob.move.dualchop=Corte Duplo (Dual Chop)
-pokemob.move.heartstamp=Carimbo de Coração (Heart Stamp)
-pokemob.move.hornleech=Chifre Sanguessuga (Horn Leech)
-pokemob.move.sacredsword=Espada Sagrada (Sacred Sword)
-pokemob.move.razorshell=Concha Navalha (Razor Shell)
-pokemob.move.heatcrash=Colisão de Calor (Heat Crash)
-pokemob.move.leaftornado=Tornado de Folhas (Leaf Tornado)
-pokemob.move.steamroller=Rolo Compressor (Steamroller)
-pokemob.move.cottonguard=Proteção de Algodão (Cotton Guard)
-pokemob.move.nightdaze=Fusco da Noite (Night Daze)
-pokemob.move.psystrike=Pancada Psíquica (Psystrike)
-pokemob.move.tailslap=Tapa de Cauda (Tail Slap)
-pokemob.move.hurricane=Furacão (Hurricane)
-pokemob.move.headcharge=Carga de Cabeça (Head Charge)
-pokemob.move.geargrind=Engrenagem Trituradora (Gear Grind)
-pokemob.move.searingshot=Tiro Abrasador (Searing Shot)
-pokemob.move.technoblast=Tecnoexplosão (Techno Blast)
-pokemob.move.relicsong=Canção Relíquia (Relic Song)
-pokemob.move.secretsword=Espada Secreta (Secret Sword)
-pokemob.move.glaciate=Glaciar (Glaciate)
-pokemob.move.boltstrike=Pancada Relâmpago (Bolt Strike)
-pokemob.move.blueflare=Labareda Azul (Blue Flare)
-pokemob.move.fierydance=Dança Ardente (Fiery Dance)
-pokemob.move.freezeshock=Choque Congelante (Freeze Shock)
-pokemob.move.iceburn=Queima Gelada (Ice Burn)
-pokemob.move.snarl=Rosnar (Snarl)
-pokemob.move.iciclecrash=Colisão de Sincelos (Icicle Crash)
-pokemob.move.vcreate=Criação V (V-create)
-pokemob.move.fusionflare=Chama Fusão (Fusion Flare)
-pokemob.move.fusionbolt=Relâmpago Fusão (Fusion Bolt)
-pokemob.move.flyingpress=Prensa Voadora (Flying Press)
-pokemob.move.matblock=Bloqueio Tatame (Mat Block)
-pokemob.move.belch=Arroto (Belch)
-pokemob.move.rototiller=Motocultivador (Rototiller)
-pokemob.move.stickyweb=Teia Pegajosa (Sticky Web)
-pokemob.move.fellstinger=Ferrão Cruel (Fell Stinger)
-pokemob.move.phantomforce=Força Fantasma (Phantom Force)
-pokemob.move.trickortreat=Doce ou Travessura (Trick-or-Treat)
-pokemob.move.nobleroar=Rugido Nobre (Noble Roar)
-pokemob.move.iondeluge=Enxurrada de Íons (Ion Deluge)
-pokemob.move.paraboliccharge=Carga Parabólica (Parabolic Charge)
-pokemob.move.forestscurse=Maldição da Floresta (Forest's Curse)
-pokemob.move.petalblizzard=Nevasca de Pétalas (Petal Blizzard)
-pokemob.move.freezedry=Seca Gelada (Freeze-Dry)
-pokemob.move.disarmingvoice=Voz Desarmante (Disarming Voice)
-pokemob.move.partingshot=Tiro de Despedida (Parting Shot)
-pokemob.move.topsyturvy=Ao Avesso (Topsy-Turvy)
-pokemob.move.drainingkiss=Beijo Drenagem (Draining Kiss)
-pokemob.move.craftyshield=Escudo Astuto (Crafty Shield)
-pokemob.move.flowershield=Escudo Floral (Flower Shield)
-pokemob.move.grassyterrain=Terreno Gramíneo (Grassy Terrain)
-pokemob.move.mistyterrain=Terreno Enevoado (Misty Terrain)
-pokemob.move.electrify=Eletrificar (Electrify)
-pokemob.move.playrough=Jogo Bruto (Play Rough)
-pokemob.move.fairywind=Vento de Fada (Fairy Wind)
-pokemob.move.moonblast=Explosão Lunar (Moonblast)
-pokemob.move.boomburst=Estouro Explosivo (Boomburst)
-pokemob.move.fairylock=Bloqueio de Fada (Fairy Lock)
-pokemob.move.kingsshield=Escudo Do Rei (King's Shield)
-pokemob.move.playnice=Jogo Legal (Play Nice)
-pokemob.move.confide=Confiar (Confide)
-pokemob.move.diamondstorm=Tempestade de Diamantes (Diamond Storm)
-pokemob.move.steameruption=Erupção de Vapor (Steam Eruption)
-pokemob.move.hyperspacehole=Buraco do Hiperespaço (Hyperspace Hole)
-pokemob.move.watershuriken=Shuriken de Água (Water Shuriken)
-pokemob.move.mysticalfire=Fogo Místico (Mystical Fire)
-pokemob.move.spikyshield=Escudo Espinhoso (Spiky Shield)
-pokemob.move.aromaticmist=Névoa Aromática (Aromatic Mist)
-pokemob.move.eerieimpulse=Impulso Misterioso (Eerie Impulse)
-pokemob.move.venomdrench=Banho Peçonhento (Venom Drench)
-pokemob.move.powder=Pó (Powder)
-pokemob.move.geomancy=Geomancia (Geomancy)
-pokemob.move.magneticflux=Fluxo Magnético (Magnetic Flux)
-pokemob.move.happyhour=Happy Hour (Happy Hour)
-pokemob.move.electricterrain=Terreno Elétrico (Electric Terrain)
-pokemob.move.dazzlinggleam=Brilho Ofuscante (Dazzling Gleam)
-pokemob.move.celebrate=Celebrar (Celebrate)
-pokemob.move.holdhands=Dar as Mãos (Hold Hands)
-pokemob.move.babydolleyes=Olhos Inocentes (Baby-Doll Eyes)
-pokemob.move.nuzzle=Esfrega Bochecha (Nuzzle)
-pokemob.move.holdback=Reter (Hold Back)
-pokemob.move.infestation=Infestação (Infestation)
-pokemob.move.poweruppunch=Soco Energizante (Power-Up Punch)
-pokemob.move.oblivionwing=Asa do Esquecimento (Oblivion Wing)
-pokemob.move.thousandarrows=Mil Flechas (Thousand Arrows)
-pokemob.move.thousandwaves=Mil Ondas (Thousand Waves)
-pokemob.move.landswrath=Ira da Terra (Land's Wrath)
-pokemob.move.lightofruin=Luz da Ruína (Light of Ruin)
-pokemob.move.originpulse=Pulso da Origem (Origin Pulse)
-pokemob.move.precipiceblades=Lâminas do Precipício (Precipice Blades)
-pokemob.move.dragonascent=Ascensão de Dragão (Dragon Ascent)
-pokemob.move.hyperspacefury=Fúria Hiperespacial (Hyperspace Fury)
diff --git a/src/main/resources/assets/pokecube_moves/lang/zh_cn.json b/src/main/resources/assets/pokecube_moves/lang/zh_cn.json
index bb5f1d3bb5..f230efecd2 100644
--- a/src/main/resources/assets/pokecube_moves/lang/zh_cn.json
+++ b/src/main/resources/assets/pokecube_moves/lang/zh_cn.json
@@ -1,926 +1,828 @@
 {
-    "_comment": "#Move Names",
-    "pokemob.status.curse.user": "%1$s §c被诅咒伤害了！",
-    "pokemob.status.flinch.user": "%1$s §c退缩了！",
-    "pokemob.status.confuse.add.user": "%1$s §c混乱了！",
-    "pokemob.status.confuse.remove.user": "%1$s §a从混乱中解除了。",
-    "pokemob.status.confusion.user": "%1$s §c混乱了，自己受伤害了！",
-    "pokemob.status.infatuate.user": "%1$s §c被迷倒了。",
-    "pokemob.move.stat.fail.user": "§c但是它失败了。",
-    "pokemob.status.curse.target": "%1$s §c被诅咒伤害了！",
-    "pokemob.status.flinch.target": "%1$s §c退缩了！",
-    "pokemob.status.confuse.add.target": "%1$s §c混乱了！",
-    "pokemob.status.confuse.remove.target": "%1$s §a从混乱中解除了。",
-    "pokemob.status.confusion.target": "%1$s §c混乱了，自己受伤害了！",
-    "pokemob.status.infatuate.target": "%1$s §c被迷倒了。",
-    "pokemob.move.stat.fail.target": "§c但是它失败了。",
-    "pokemob.move.super.effective.user": "§a效果绝佳！",
-    "pokemob.move.not.very.effective.user": "§c效果不好...",
-    "pokemob.move.doesnt.affect.user": "§c对 %1$s 没有效果！",
-    "pokemob.move.critical.hit.user": "§a击中要害！",
-    "pokemob.move.super.effective.target": "§a效果绝佳！",
-    "pokemob.move.not.very.effective.target": "§c效果不好...",
-    "pokemob.move.doesnt.affect.target": "§c对 %1$s 没有效果！",
-    "pokemob.move.critical.hit.target": "§a击中要害！",
-    "pokemob.move.used.user": "%1$s 使用 %2$s!",
-    "pokemob.move.used.target": "敌方 %1$s 使用 %2$s!",
-    "pokemob.move.stat.rise1.user": "%1$s的 §6%2$s §a上升了。",
-    "pokemob.move.stat.rise2.user": "%1$s的 §6%2$s §a急速上升。",
-    "pokemob.move.stat.rise3.user": "%1$s的 §6%2$s §a大幅度上升。",
-    "pokemob.move.stat.fall1.user": "%1$s的 §6%2$s §c下降了。",
-    "pokemob.move.stat.fall2.user": "%1$s的 §6%2$s §c急速下降。",
-    "pokemob.move.stat.fall3.user": "%1$s的 §6%2$s §c大幅度下降。",
-    "pokemob.move.stat.rise1.target": "%1$s的 §6%2$s §a上升了。",
-    "pokemob.move.stat.rise2.target": "%1$s的 §6%2$s §a急速上升。",
-    "pokemob.move.stat.rise3.target": "%1$s的 §6%2$s §a大幅度上升。",
-    "pokemob.move.stat.fall1.target": "%1$s的 §6%2$s §c下降了。",
-    "pokemob.move.stat.fall2.target": "%1$s的 §6%2$s §c急速下降。",
-    "pokemob.move.stat.fall3.target": "%1$s的 §6%2$s §c大幅度下降。",
-    "pokemob.move.stat1": "物攻",
-    "pokemob.move.stat2": "物防",
-    "pokemob.move.stat3": "特攻",
-    "pokemob.move.stat4": "特防",
-    "pokemob.move.stat5": "速度",
-    "pokemob.move.stat6": "命中率",
-    "pokemob.move.stat7": "闪避率",
-    "pokemob.move.notify.learn": "%1$s 学会了 %2$s ！",
-    "pokemob.move.terraindamage": "%1$s 受到了%2$s的伤害。",
-    "pokemob.move.missed.user": "§c没有打中§r %1$s!",
-    "pokemob.move.missed.target": "§c没有打中§r %1$s!",
-    "pokemob.move.failed.user": "%1$s的 §c攻击失败!",
-    "pokemob.move.failed.target": "%1$s的 §a攻击失败!",
-    "pokemob.move.isfrozen.user": "%1$s §c被冰冻。",
-    "pokemob.move.issleeping.user": "%1$s §c在睡觉。",
-    "pokemob.move.isfullyparalyzed.user": "%1$s §c完全麻痹了。",
-    "pokemob.move.paralyzed.user": "%1$s §c麻痹了。",
-    "pokemob.move.isburned.user": "%1$s §c被烧伤。",
-    "pokemob.move.ispoisoned.user": "%1$s §c中毒了。",
-    "pokemob.move.isbadlypoisoned.user": "%1$s §c中了猛毒。",
-    "pokemob.move.isfrozen.target": "%1$s §c被冰冻。",
-    "pokemob.move.issleeping.target": "%1$s §c在睡觉。",
-    "pokemob.move.isfullyparalyzed.target": "%1$s §c完全麻痹了。",
-    "pokemob.move.paralyzed.target": "%1$s §c麻痹了。",
-    "pokemob.move.isburned.target": "%1$s §c被烧伤。",
-    "pokemob.move.ispoisoned.target": "%1$s §c中毒了。",
-    "pokemob.move.isbadlypoisoned.target": "%1$s §c中了猛毒。",
-    "pokemob.move.sketched": "%1$s 勾勒出 %2$s",
-    "pokemob.move.cooldown": "%1$s §c不能马上使用 %2$s 。",
-    "pokemob.move.10000000voltthunderbolt": "千万伏特",
-    "pokemob.move.absorb": "怪力",
-    "pokemob.move.accelerock": "冲岩",
-    "pokemob.move.acid": "溶解液",
-    "pokemob.move.acidarmor": "溶化",
-    "pokemob.move.aciddownpour": "强酸剧毒灭绝雨",
-    "pokemob.move.acidspray": "酸液炸弹",
-    "pokemob.move.acrobatics": "杂技",
-    "pokemob.move.acupressure": "点穴",
-    "pokemob.move.aerialace": "燕返",
-    "pokemob.move.aeroblast": "气旋攻击",
-    "pokemob.move.afteryou": "您先請",
-    "pokemob.move.agility": "高速移动",
-    "pokemob.move.aircutter": "空气利刃",
-    "pokemob.move.airslash": "空气斩",
-    "pokemob.move.alloutpummeling": "全力无双激烈拳",
-    "pokemob.move.allyswitch": "交换场地",
-    "pokemob.move.amnesia": "瞬间失忆",
-    "pokemob.move.anchorshot": "掷锚",
-    "pokemob.move.ancientpower": "原始之力",
-    "pokemob.move.aquajet": "水流喷射",
-    "pokemob.move.aquaring": "水流环",
-    "pokemob.move.aquatail": "水流尾",
-    "pokemob.move.armthrust": "猛推",
-    "pokemob.move.aromatherapy": "芳香治疗",
-    "pokemob.move.aromaticmist": "芳香薄雾",
-    "pokemob.move.assist": "借助",
-    "pokemob.move.assurance": "恶意追击",
-    "pokemob.move.astonish": "惊吓",
-    "pokemob.move.attackorder": "攻击指令",
-    "pokemob.move.attract": "迷人",
-    "pokemob.move.aurasphere": "波导弹",
-    "pokemob.move.aurorabeam": "极光束",
-    "pokemob.move.auroraveil": "极光幕",
-    "pokemob.move.autotomize": "身体轻量化",
-    "pokemob.move.avalanche": "雪崩",
-    "pokemob.move.babydolleyes": "圆瞳",
-    "pokemob.move.banefulbunker": "碉堡",
-    "pokemob.move.barrage": "投球",
-    "pokemob.move.barrier": "屏障",
-    "pokemob.move.batonpass": "接棒",
-    "pokemob.move.beakblast": "鸟嘴加农炮",
-    "pokemob.move.beatup": "围攻",
-    "pokemob.move.belch": "打嗝",
-    "pokemob.move.bellydrum": "腹鼓",
-    "pokemob.move.bestow": "传递礼物",
-    "pokemob.move.bide": "忍耐",
-    "pokemob.move.bind": "绑紧",
-    "pokemob.move.bite": "咬住",
-    "pokemob.move.blackholeeclipse": "黑洞吞噬万物灭",
-    "pokemob.move.blastburn": "爆炸烈焰",
-    "pokemob.move.blazekick": "火焰踢",
-    "pokemob.move.blizzard": "落英缤纷",
-    "pokemob.move.block": "挡路",
-    "pokemob.move.bloomdoom": "绚烂缤纷花怒放",
-    "pokemob.move.blueflare": "青焰",
-    "pokemob.move.bodyslam": "泰山压顶",
-    "pokemob.move.boltstrike": "雷击",
-    "pokemob.move.boneclub": "骨棒",
-    "pokemob.move.bonemerang": "骨头回力镖",
-    "pokemob.move.bonerush": "骨棒乱打",
-    "pokemob.move.boomburst": "爆音波",
-    "pokemob.move.bounce": "弹跳",
-    "pokemob.move.bravebird": "勇鸟猛攻",
-    "pokemob.move.breakneckblitz": "究极无敌大冲撞",
-    "pokemob.move.brickbreak": "劈瓦",
-    "pokemob.move.brine": "盐水",
-    "pokemob.move.brutalswing": "狂舞挥打",
-    "pokemob.move.bubble": "活活气泡",
-    "pokemob.move.bubblebeam": "泡沫光线",
-    "pokemob.move.bugbite": "虫咬",
-    "pokemob.move.bugbuzz": "虫鸣",
-    "pokemob.move.bulkup": "健美",
-    "pokemob.move.bulldoze": "重踏",
-    "pokemob.move.bulletpunch": "子弹拳",
-    "pokemob.move.bulletseed": "种子机关枪",
-    "pokemob.move.burnup": "燃尽",
-    "pokemob.move.calmmind": "冥想",
-    "pokemob.move.camouflage": "保护色",
-    "pokemob.move.captivate": "诱惑",
-    "pokemob.move.catastropika": "皮卡皮卡必杀击",
-    "pokemob.move.celebrate": "庆祝",
-    "pokemob.move.charge": "充电",
-    "pokemob.move.chargebeam": "充电光束",
-    "pokemob.move.charm": "撒娇",
-    "pokemob.move.chatter": "喋喋不休",
-    "pokemob.move.chipaway": "逐步击破",
-    "pokemob.move.circlethrow": "巴投",
-    "pokemob.move.clamp": "贝壳夹击",
-    "pokemob.move.clangingscales": "鳞片噪音",
-    "pokemob.move.clearsmog": "清除之煙",
-    "pokemob.move.closecombat": "近身战",
-    "pokemob.move.coil": "盤蜷",
-    "pokemob.move.cometpunch": "连续拳",
-    "pokemob.move.confide": "密语",
-    "pokemob.move.confuseray": "奇异之光",
-    "pokemob.move.confusion": "念力",
-    "pokemob.move.constrict": "缠绕",
-    "pokemob.move.continentalcrush": "毁天灭地巨岩坠",
-    "pokemob.move.conversion": "纹理",
-    "pokemob.move.conversion2": "纹理２",
-    "pokemob.move.copycat": "仿效",
-    "pokemob.move.coreenforcer": "核心惩罚者",
-    "pokemob.move.corkscrewcrash": "超绝螺旋连击",
-    "pokemob.move.cosmicpower": "宇宙力量",
-    "pokemob.move.cottonguard": "棉花防守",
-    "pokemob.move.cottonspore": "棉孢子",
-    "pokemob.move.counter": "双倍奉还",
-    "pokemob.move.covet": "渴望",
-    "pokemob.move.crabhammer": "蟹钳锤",
-    "pokemob.move.craftyshield": "戏法防守",
-    "pokemob.move.crosschop": "十字劈",
-    "pokemob.move.crosspoison": "十字毒刃",
-    "pokemob.move.crunch": "咬碎",
-    "pokemob.move.crushclaw": "撕裂爪",
-    "pokemob.move.crushgrip": "捏碎",
-    "pokemob.move.curse": "诅咒",
-    "pokemob.move.cut": "居合斩",
-    "pokemob.move.darkestlariat": "ＤＤ金勾臂",
-    "pokemob.move.darkpulse": "恶之波动",
-    "pokemob.move.darkvoid": "暗黑洞",
-    "pokemob.move.dazzlinggleam": "魔法闪耀",
-    "pokemob.move.defendorder": "防御指令",
-    "pokemob.move.defensecurl": "变圆",
-    "pokemob.move.defog": "清除浓雾",
-    "pokemob.move.destinybond": "同命",
-    "pokemob.move.detect": "看穿",
-    "pokemob.move.devastatingdrake": "究极巨龙震天地",
-    "pokemob.move.diamondstorm": "钻石风暴",
-    "pokemob.move.dig": "挖洞",
-    "pokemob.move.disable": "定身法",
-    "pokemob.move.disarmingvoice": "魅惑之声",
-    "pokemob.move.discharge": "放电",
-    "pokemob.move.dive": "潜水",
-    "pokemob.move.dizzypunch": "迷昏拳",
-    "pokemob.move.doomdesire": "破灭之愿",
-    "pokemob.move.doubleedge": "舍身冲撞",
-    "pokemob.move.doubleironbash": "钢拳双击",
-    "pokemob.move.doublehit": "二连击",
-    "pokemob.move.doublekick": "二连踢",
-    "pokemob.move.doubleslap": "连环巴掌",
-    "pokemob.move.doubleteam": "影子分身",
-    "pokemob.move.dracometeor": "流星群",
-    "pokemob.move.dragonascent": "画龙点睛",
-    "pokemob.move.dragonbreath": "龙息",
-    "pokemob.move.dragonclaw": "龙爪",
-    "pokemob.move.dragondance": "龙之舞",
-    "pokemob.move.dragonhammer": "龙锤",
-    "pokemob.move.dragonpulse": "龙之波动",
-    "pokemob.move.dragonrage": "龙之怒",
-    "pokemob.move.dragonrush": "龙之俯冲",
-    "pokemob.move.dragontail": "龙尾",
-    "pokemob.move.drainingkiss": "吸取之吻",
-    "pokemob.move.drainpunch": "吸取拳",
-    "pokemob.move.dreameater": "食梦",
-    "pokemob.move.drillpeck": "啄钻",
-    "pokemob.move.drillrun": "直冲钻",
-    "pokemob.move.dualchop": "二连劈",
-    "pokemob.move.dynamicpunch": "爆裂拳",
-    "pokemob.move.earthpower": "大地之力",
-    "pokemob.move.earthquake": "地震",
-    "pokemob.move.echoedvoice": "迴声",
-    "pokemob.move.eerieimpulse": "怪异电波",
-    "pokemob.move.eggbomb": "炸蛋",
-    "pokemob.move.electricterrain": "电气场地",
-    "pokemob.move.electrify": "输电",
-    "pokemob.move.electroball": "电球",
-    "pokemob.move.electroweb": "电网",
-    "pokemob.move.embargo": "查封",
-    "pokemob.move.ember": "火花",
-    "pokemob.move.encore": "再来一次",
-    "pokemob.move.endeavor": "蛮干",
-    "pokemob.move.endure": "挺住",
-    "pokemob.move.energyball": "能量球",
-    "pokemob.move.entrainment": "找伙伴",
-    "pokemob.move.eruption": "喷火",
-    "pokemob.move.explosion": "大爆炸",
-    "pokemob.move.extrasensory": "神通力",
-    "pokemob.move.extremeevoboost": "九彩昇华齐聚顶",
-    "pokemob.move.extremespeed": "神速",
-    "pokemob.move.facade": "硬撑",
-    "pokemob.move.fairylock": "妖精之锁",
-    "pokemob.move.fairywind": "妖精之风",
-    "pokemob.move.fakeout": "击掌奇袭",
-    "pokemob.move.faketears": "假哭",
-    "pokemob.move.falseswipe": "点到为止",
-    "pokemob.move.featherdance": "羽毛舞",
-    "pokemob.move.feint": "佯攻",
-    "pokemob.move.feintattack": "出奇一击",
-    "pokemob.move.fellstinger": "致命针刺",
-    "pokemob.move.fierydance": "火之舞",
-    "pokemob.move.finalgambit": "搏命",
-    "pokemob.move.fireblast": "大字爆炎",
-    "pokemob.move.firefang": "火焰牙",
-    "pokemob.move.firelash": "火焰鞭",
-    "pokemob.move.firepledge": "火之誓約",
-    "pokemob.move.firepunch": "火焰拳",
-    "pokemob.move.firespin": "火焰旋涡",
-    "pokemob.move.firstimpression": "迎头一击",
-    "pokemob.move.fissure": "地裂",
-    "pokemob.move.flail": "抓狂",
-    "pokemob.move.flameburst": "烈焰溅射",
-    "pokemob.move.flamecharge": "蓄能焰襲",
-    "pokemob.move.flamethrower": "喷射火焰",
-    "pokemob.move.flamewheel": "火焰轮",
-    "pokemob.move.flareblitz": "闪焰冲锋",
-    "pokemob.move.flash": "闪光",
-    "pokemob.move.flashcannon": "加农光炮",
-    "pokemob.move.flatter": "吹捧",
-    "pokemob.move.fleurcannon": "花朵加农炮",
-    "pokemob.move.fling": "投擲",
-    "pokemob.move.floralhealing": "花疗",
-    "pokemob.move.flowershield": "鲜花防守",
-    "pokemob.move.fly": "飞翔",
-    "pokemob.move.flyingpress": "飞身重压",
-    "pokemob.move.focusblast": "真气弹",
-    "pokemob.move.focusenergy": "聚气",
-    "pokemob.move.focuspunch": "真气拳",
-    "pokemob.move.followme": "看我嘛",
-    "pokemob.move.forcepalm": "发劲",
-    "pokemob.move.foresight": "识破",
-    "pokemob.move.forestscurse": "森林诅咒",
-    "pokemob.move.foulplay": "欺诈",
-    "pokemob.move.freezedry": "冷冻干燥",
-    "pokemob.move.freezeshock": "冰冻伏特",
-    "pokemob.move.frenzyplant": "疯狂植物",
-    "pokemob.move.frostbreath": "冰息",
-    "pokemob.move.frustration": "迁怒",
-    "pokemob.move.furyattack": "乱击",
-    "pokemob.move.furycutter": "连斩",
-    "pokemob.move.furyswipes": "乱抓",
-    "pokemob.move.fusionbolt": "交错闪电",
-    "pokemob.move.fusionflare": "交错火焰",
-    "pokemob.move.futuresight": "预知未来",
-    "pokemob.move.gastroacid": "胃液",
-    "pokemob.move.geargrind": "齿轮飞盘",
-    "pokemob.move.gearup": "辅助齿轮",
-    "pokemob.move.genesissupernova": "起源超新星大爆炸",
-    "pokemob.move.geomancy": "大地掌控",
-    "pokemob.move.gigadrain": "终极吸取",
-    "pokemob.move.gigaimpact": "终极冲击",
-    "pokemob.move.gigavolthavoc": "终极伏特狂雷闪",
-    "pokemob.move.glaciate": "冰封世界",
-    "pokemob.move.glare": "大蛇瞪眼",
-    "pokemob.move.grassknot": "打草结",
-    "pokemob.move.grasspledge": "草之誓约",
-    "pokemob.move.grasswhistle": "草笛",
-    "pokemob.move.grassyterrain": "青草场地",
-    "pokemob.move.gravity": "重力",
-    "pokemob.move.growl": "叫声",
-    "pokemob.move.growth": "生长",
-    "pokemob.move.grudge": "怨念",
-    "pokemob.move.guardianofalola": "巨人卫士•阿罗拉",
-    "pokemob.move.guardsplit": "防守平分",
-    "pokemob.move.guardswap": "防守互换",
-    "pokemob.move.guillotine": "断头钳",
-    "pokemob.move.gunkshot": "垃圾射击",
-    "pokemob.move.gust": "起风",
-    "pokemob.move.gyroball": "陀螺球",
-    "pokemob.move.hail": "冰雹",
-    "pokemob.move.hammerarm": "臂錘",
-    "pokemob.move.happyhour": "欢乐时光",
-    "pokemob.move.harden": "变硬",
-    "pokemob.move.haze": "黑雾",
-    "pokemob.move.headbutt": "头锤",
-    "pokemob.move.headcharge": "爆炸头突击",
-    "pokemob.move.headsmash": "双刃头锤",
-    "pokemob.move.healbell": "治愈铃声",
-    "pokemob.move.healblock": "回复封锁",
-    "pokemob.move.healingwish": "治愈之愿",
-    "pokemob.move.healorder": "回复指令",
-    "pokemob.move.healpulse": "治愈波动",
-    "pokemob.move.heartstamp": "愛心印章",
-    "pokemob.move.heartswap": "心灵互换",
-    "pokemob.move.heatcrash": "高溫重压",
-    "pokemob.move.heatwave": "热风",
-    "pokemob.move.heavyslam": "重磅冲撞",
-    "pokemob.move.helpinghand": "帮助",
-    "pokemob.move.hex": "祸不单行",
-    "pokemob.move.hiddenpower": "觉醒力量",
-    "pokemob.move.highhorsepower": "十万马力",
-    "pokemob.move.highjumpkick": "飞膝踢",
-    "pokemob.move.holdback": "手下留情",
-    "pokemob.move.holdhands": "牵手",
-    "pokemob.move.honeclaws": "磨爪",
-    "pokemob.move.hornattack": "角撞",
-    "pokemob.move.horndrill": "角钻",
-    "pokemob.move.hornleech": "木角",
-    "pokemob.move.howl": "长嚎",
-    "pokemob.move.hurricane": "暴风",
-    "pokemob.move.hydrocannon": "加农水炮",
-    "pokemob.move.hydropump": "水炮",
-    "pokemob.move.hydrovortex": "超级水流大漩涡",
-    "pokemob.move.hyperbeam": "破坏光线",
-    "pokemob.move.hyperfang": "必杀门牙",
-    "pokemob.move.hyperspacefury": "异次元猛攻",
-    "pokemob.move.hyperspacehole": "异次元洞",
-    "pokemob.move.hypervoice": "巨声",
-    "pokemob.move.hypnosis": "催眠术",
-    "pokemob.move.iceball": "冰球",
-    "pokemob.move.icebeam": "冰冻光束",
-    "pokemob.move.iceburn": "极寒冷焰",
-    "pokemob.move.icefang": "冰冻牙",
-    "pokemob.move.icehammer": "冰锤",
-    "pokemob.move.icepunch": "冰冻拳",
-    "pokemob.move.iceshard": "冰砾",
-    "pokemob.move.iciclecrash": "冰柱坠击",
-    "pokemob.move.iciclespear": "冰锥",
-    "pokemob.move.icywind": "冰冻之风",
-    "pokemob.move.imprison": "封印",
-    "pokemob.move.incinerate": "烧尽",
-    "pokemob.move.inferno": "炼狱",
-    "pokemob.move.infernooverdrive": "超强极限爆焰弹",
-    "pokemob.move.infestation": "死缠烂打",
-    "pokemob.move.ingrain": "扎根",
-    "pokemob.move.instruct": "号令",
-    "pokemob.move.iondeluge": "等离子浴",
-    "pokemob.move.irondefense": "铁壁",
-    "pokemob.move.ironhead": "铁头",
-    "pokemob.move.irontail": "铁尾",
-    "pokemob.move.judgment": "制裁光砾",
-    "pokemob.move.jumpkick": "飞踢",
-    "pokemob.move.karatechop": "空手劈",
-    "pokemob.move.kinesis": "折弯汤匙",
-    "pokemob.move.kingsshield": "王者盾牌",
-    "pokemob.move.knockoff": "拍落",
-    "pokemob.move.landswrath": "大地神力",
-    "pokemob.move.laserfocus": "磨砺",
-    "pokemob.move.lastresort": "珍藏",
-    "pokemob.move.lavaplume": "喷烟",
-    "pokemob.move.leafage": "树叶",
-    "pokemob.move.leafblade": "叶刃",
-    "pokemob.move.leafstorm": "飞叶风暴",
-    "pokemob.move.leaftornado": "青草搅拌器",
-    "pokemob.move.leechlife": "吸血",
-    "pokemob.move.leechseed": "寄生种子",
-    "pokemob.move.leer": "瞪眼",
-    "pokemob.move.lick": "舌舔",
-    "pokemob.move.lightofruin": "破灭之光",
-    "pokemob.move.lightscreen": "光墙",
-    "pokemob.move.liquidation": "水流裂破",
-    "pokemob.move.lockon": "锁定",
-    "pokemob.move.lovelykiss": "恶魔之吻",
-    "pokemob.move.lowkick": "踢倒",
-    "pokemob.move.lowsweep": "下盘踢",
-    "pokemob.move.luckychant": "幸运咒语",
-    "pokemob.move.lunardance": "新月舞",
-    "pokemob.move.lunge": "猛扑",
-    "pokemob.move.lusterpurge": "洁净光芒",
-    "pokemob.move.machpunch": "音速拳",
-    "pokemob.move.magicalleaf": "魔法叶",
-    "pokemob.move.magiccoat": "魔法反射",
-    "pokemob.move.magicroom": "魔法空间",
-    "pokemob.move.magmastorm": "熔岩风暴",
-    "pokemob.move.magnetbomb": "磁铁炸弹",
-    "pokemob.move.magneticflux": "磁场操控",
-    "pokemob.move.magnetrise": "电磁飘浮",
-    "pokemob.move.magnitude": "震级",
-    "pokemob.move.maliciousmoonsault": "极恶飞躍粉碎击",
-    "pokemob.move.matblock": "掀榻榻米",
-    "pokemob.move.meanlook": "黑色目光",
-    "pokemob.move.meditate": "瑜伽姿势",
-    "pokemob.move.mefirst": "抢先一步",
-    "pokemob.move.megadrain": "超级吸取",
-    "pokemob.move.megahorn": "超级角击",
-    "pokemob.move.megakick": "百万吨重踢",
-    "pokemob.move.megapunch": "百万吨重拳",
-    "pokemob.move.memento": "临别礼物",
-    "pokemob.move.metalburst": "金属爆炸",
-    "pokemob.move.metalclaw": "金属爪",
-    "pokemob.move.metalsound": "金属音",
-    "pokemob.move.meteormash": "彗星拳",
-    "pokemob.move.metronome": "挥指",
-    "pokemob.move.milkdrink": "喝牛奶",
-    "pokemob.move.mimic": "模仿",
-    "pokemob.move.mindreader": "心之眼",
-    "pokemob.move.minimize": "变小",
-    "pokemob.move.miracleeye": "奇迹之眼",
-    "pokemob.move.mirrorcoat": "镜面反射",
-    "pokemob.move.mirrormove": "鹦鹉学舌",
-    "pokemob.move.mirrorshot": "镜光射击",
-    "pokemob.move.mist": "白雾",
-    "pokemob.move.mistball": "薄霧球",
-    "pokemob.move.mistyterrain": "薄雾场地",
-    "pokemob.move.moonblast": "月亮之力",
-    "pokemob.move.moongeistbeam": "暗影之光",
-    "pokemob.move.moonlight": "月光",
-    "pokemob.move.morningsun": "晨光",
-    "pokemob.move.mudbomb": "泥巴炸弹",
-    "pokemob.move.muddywater": "浊流",
-    "pokemob.move.mudshot": "泥巴射击",
-    "pokemob.move.mudslap": "掷泥",
-    "pokemob.move.mudsport": "玩泥巴",
-    "pokemob.move.multiattack": "多属性攻击",
-    "pokemob.move.mysticalfire": "魔法火焰",
-    "pokemob.move.nastyplot": "诡计",
-    "pokemob.move.naturalgift": "自然之恩",
-    "pokemob.move.naturepower": "自然之力",
-    "pokemob.move.naturesmadness": "自然之怒",
-    "pokemob.move.needlearm": "尖刺臂",
-    "pokemob.move.neverendingnightmare": "无尽暗夜之诱惑",
-    "pokemob.move.nightdaze": "暗黑爆破",
-    "pokemob.move.nightmare": "恶梦",
-    "pokemob.move.nightshade": "黑夜魔影",
-    "pokemob.move.nightslash": "暗袭要害",
-    "pokemob.move.nobleroar": "战吼",
-    "pokemob.move.nuzzle": "蹭蹭臉頰",
-    "pokemob.move.oblivionwing": "死亡之翼",
-    "pokemob.move.oceanicoperetta": "海神庄严交响乐",
-    "pokemob.move.octazooka": "章鱼桶炮",
-    "pokemob.move.odorsleuth": "气味侦测",
-    "pokemob.move.ominouswind": "奇异之风",
-    "pokemob.move.originpulse": "根源波动",
-    "pokemob.move.outrage": "逆鳞",
-    "pokemob.move.overheat": "过热",
-    "pokemob.move.painsplit": "分担痛楚",
-    "pokemob.move.paraboliccharge": "抛物面充电",
-    "pokemob.move.partingshot": "抛下狠话",
-    "pokemob.move.payback": "以牙还牙",
-    "pokemob.move.payday": "聚宝功",
-    "pokemob.move.peck": "啄",
-    "pokemob.move.perishsong": "灭亡之歌",
-    "pokemob.move.petalblizzard": "落英缤纷",
-    "pokemob.move.petaldance": "花瓣舞",
-    "pokemob.move.phantomforce": "潜灵奇袭",
-    "pokemob.move.pinmissile": "飞弹针",
-    "pokemob.move.playnice": "和睦相处",
-    "pokemob.move.playrough": "嬉闹",
-    "pokemob.move.pluck": "啄食",
-    "pokemob.move.poisonfang": "剧毒牙",
-    "pokemob.move.poisongas": "毒瓦斯",
-    "pokemob.move.poisonjab": "毒击",
-    "pokemob.move.poisonpowder": "毒粉",
-    "pokemob.move.poisonsting": "毒针",
-    "pokemob.move.poisontail": "毒尾",
-    "pokemob.move.pollenpuff": "花粉团",
-    "pokemob.move.photongeyser": "光子喷涌",
-    "pokemob.move.pound": "拍击",
-    "pokemob.move.powder": "粉尘",
-    "pokemob.move.powdersnow": "细雪",
-    "pokemob.move.powergem": "力量宝石",
-    "pokemob.move.powersplit": "力量平分",
-    "pokemob.move.powerswap": "力量互换",
-    "pokemob.move.powertrick": "力量戏法",
-    "pokemob.move.powertrip": "嚣张",
-    "pokemob.move.poweruppunch": "增强拳",
-    "pokemob.move.powerwhip": "强力鞭打",
-    "pokemob.move.precipiceblades": "断崖之剑",
-    "pokemob.move.present": "礼物",
-    "pokemob.move.prismaticlaser": "棱镜镭射",
-    "pokemob.move.protect": "守住",
-    "pokemob.move.psybeam": "幻象光线",
-    "pokemob.move.psychic": "精神强念",
-    "pokemob.move.psychicfangs": "精神之牙",
-    "pokemob.move.psychicterrain": "精神场地",
-    "pokemob.move.psychoboost": "精神突进",
-    "pokemob.move.psychocut": "精神利刃",
-    "pokemob.move.psychoshift": "精神转移",
-    "pokemob.move.psychup": "自我暗示",
-    "pokemob.move.psyshock": "精神冲击",
-    "pokemob.move.psystrike": "精神击破",
-    "pokemob.move.psywave": "精神波",
-    "pokemob.move.pulverizingpancake": "认真起来大爆击",
-    "pokemob.move.punishment": "懲罰",
-    "pokemob.move.purify": "净化",
-    "pokemob.move.pursuit": "追打",
-    "pokemob.move.quash": "延後",
-    "pokemob.move.quickattack": "电光一闪",
-    "pokemob.move.quickguard": "快速防守",
-    "pokemob.move.quiverdance": "蝶舞",
-    "pokemob.move.rage": "愤怒",
-    "pokemob.move.ragepowder": "愤怒粉",
-    "pokemob.move.raindance": "求雨",
-    "pokemob.move.rapidspin": "高速旋转",
-    "pokemob.move.razorleaf": "飞叶快刀",
-    "pokemob.move.razorshell": "贝壳刃",
-    "pokemob.move.razorwind": "旋风刀",
-    "pokemob.move.recover": "自我再生",
-    "pokemob.move.recycle": "回收利用",
-    "pokemob.move.reflect": "反射壁",
-    "pokemob.move.reflecttype": "镜面属性",
-    "pokemob.move.refresh": "焕然一新",
-    "pokemob.move.relicsong": "古老之歌",
-    "pokemob.move.rest": "睡觉",
-    "pokemob.move.retaliate": "报仇",
-    "pokemob.move.return": "报恩",
-    "pokemob.move.revelationdance": "觉醒之舞",
-    "pokemob.move.revenge": "报复",
-    "pokemob.move.reversal": "起死回生",
-    "pokemob.move.roar": "吼叫",
-    "pokemob.move.roaroftime": "时光咆哮",
-    "pokemob.move.rockblast": "岩石爆击",
-    "pokemob.move.rockclimb": "攀岩",
-    "pokemob.move.rockpolish": "岩石打磨",
-    "pokemob.move.rockslide": "岩崩",
-    "pokemob.move.rocksmash": "碎岩",
-    "pokemob.move.rockthrow": "落石",
-    "pokemob.move.rocktomb": "岩石封锁",
-    "pokemob.move.rockwrecker": "岩石炮",
-    "pokemob.move.roleplay": "扮演",
-    "pokemob.move.rollingkick": "回旋踢",
-    "pokemob.move.rollout": "滚动",
-    "pokemob.move.roost": "羽栖",
-    "pokemob.move.rototiller": "耕地",
-    "pokemob.move.round": "轮唱",
-    "pokemob.move.sacredfire": "神圣之火",
-    "pokemob.move.sacredsword": "圣剑",
-    "pokemob.move.safeguard": "神秘守护",
-    "pokemob.move.sandattack": "泼沙",
-    "pokemob.move.sandstorm": "沙暴",
-    "pokemob.move.sandtomb": "流沙地狱",
-    "pokemob.move.savagespinout": "绝对捕食回旋斩",
-    "pokemob.move.scald": "热水",
-    "pokemob.move.scaryface": "鬼面",
-    "pokemob.move.scratch": "抓",
-    "pokemob.move.screech": "刺耳声",
-    "pokemob.move.searingshot": "火焰弹",
-    "pokemob.move.secretpower": "秘密之力",
-    "pokemob.move.secretsword": "神秘之剑",
-    "pokemob.move.seedbomb": "种子炸弹",
-    "pokemob.move.seedflare": "种子闪光",
-    "pokemob.move.seismictoss": "地球上投",
-    "pokemob.move.selfdestruct": "自爆",
-    "pokemob.move.shadowball": "暗影球",
-    "pokemob.move.shadowbone": "暗影之骨",
-    "pokemob.move.shadowclaw": "暗影爪",
-    "pokemob.move.shadowforce": "暗影潜袭",
-    "pokemob.move.shadowpunch": "暗影拳",
-    "pokemob.move.shadowsneak": "影子偷袭",
-    "pokemob.move.sharpen": "棱角化",
-    "pokemob.move.shatteredpsyche": "至高精神破坏波",
-    "pokemob.move.sheercold": "绝对零度",
-    "pokemob.move.shellsmash": "破壳",
-    "pokemob.move.shelltrap": "陷阱甲壳",
-    "pokemob.move.shiftgear": "换挡",
-    "pokemob.move.shockwave": "电击波",
-    "pokemob.move.shoreup": "集沙",
-    "pokemob.move.signalbeam": "信号光束",
-    "pokemob.move.silverwind": "银色旋风",
-    "pokemob.move.simplebeam": "单纯光束",
-    "pokemob.move.sing": "唱歌",
-    "pokemob.move.sinisterarrowraid": "遮天蔽日暗影箭",
-    "pokemob.move.sketch": "写生",
-    "pokemob.move.skillswap": "特性互换",
-    "pokemob.move.skullbash": "火箭头锤",
-    "pokemob.move.skyattack": "神鸟猛击",
-    "pokemob.move.skydrop": "自由落体",
-    "pokemob.move.skyuppercut": "冲天拳",
-    "pokemob.move.slackoff": "偷懒",
-    "pokemob.move.slam": "摔打",
-    "pokemob.move.slash": "劈开",
-    "pokemob.move.sleeppowder": "催眠粉",
-    "pokemob.move.sleeptalk": "梦话",
-    "pokemob.move.sludge": "污泥攻击",
-    "pokemob.move.sludgebomb": "污泥炸弹",
-    "pokemob.move.sludgewave": "污泥波",
-    "pokemob.move.smackdown": "击落",
-    "pokemob.move.smartstrike": "修长之角",
-    "pokemob.move.smellingsalts": "清醒",
-    "pokemob.move.smog": "浊雾",
-    "pokemob.move.smokescreen": "烟幕",
-    "pokemob.move.snarl": "大声咆哮",
-    "pokemob.move.snatch": "抢夺",
-    "pokemob.move.snore": "打鼾",
-    "pokemob.move.soak": "浸水",
-    "pokemob.move.softboiled": "生蛋",
-    "pokemob.move.solarbeam": "日光束",
-    "pokemob.move.solarblade": "日光刃",
-    "pokemob.move.sonicboom": "音爆",
-    "pokemob.move.soulstealing7starstrike": "七星夺魂腿",
-    "pokemob.move.spacialrend": "亚空裂斩",
-    "pokemob.move.spark": "电光",
-    "pokemob.move.sparklingaria": "泡影的咏叹调",
-    "pokemob.move.spectralthief": "暗影偷盗",
-    "pokemob.move.speedswap": "速度互换",
-    "pokemob.move.spiderweb": "蛛网",
-    "pokemob.move.spikecannon": "尖刺加农炮",
-    "pokemob.move.spikes": "撒菱",
-    "pokemob.move.spikyshield": "尖刺防守",
-    "pokemob.move.spiritshackle": "缝影",
-    "pokemob.move.spite": "怨恨",
-    "pokemob.move.spitup": "喷出",
-    "pokemob.move.splash": "跃起",
-    "pokemob.move.spore": "蘑菇孢子",
-    "pokemob.move.spotlight": "聚光灯",
-    "pokemob.move.stealthrock": "隐形岩",
-    "pokemob.move.steameruption": "蒸汽爆炸",
-    "pokemob.move.steamroller": "疯狂滚压",
-    "pokemob.move.steelwing": "钢翼",
-    "pokemob.move.stickyweb": "黏黏网",
-    "pokemob.move.stockpile": "蓄力",
-    "pokemob.move.stokedsparksurfer": "驾雷驭电戏冲浪",
-    "pokemob.move.stomp": "踩踏",
-    "pokemob.move.stompingtantrum": "跺脚",
-    "pokemob.move.stoneedge": "尖石攻击",
-    "pokemob.move.storedpower": "辅助力量",
-    "pokemob.move.stormthrow": "山岚摔",
-    "pokemob.move.strength": "怪力",
-    "pokemob.move.strengthsap": "吸取力量",
-    "pokemob.move.stringshot": "吐丝",
-    "pokemob.move.struggle": "挣扎",
-    "pokemob.move.strugglebug": "虫之抵抗",
-    "pokemob.move.stunspore": "麻痹粉",
-    "pokemob.move.submission": "地狱翻滚",
-    "pokemob.move.substitute": "替身",
-    "pokemob.move.subzeroslammer": "激狂大地万里冰",
-    "pokemob.move.suckerpunch": "突袭",
-    "pokemob.move.sunnyday": "大晴天",
-    "pokemob.move.sunsteelstrike": "流星闪冲",
-    "pokemob.move.superfang": "愤怒门牙",
-    "pokemob.move.superpower": "蛮力",
-    "pokemob.move.supersonic": "超音波",
-    "pokemob.move.supersonicskystrike": "极速俯冲轰烈撞",
-    "pokemob.move.surf": "冲浪",
-    "pokemob.move.swagger": "虚张声势",
-    "pokemob.move.swallow": "吞下",
-    "pokemob.move.sweetkiss": "天使之吻",
-    "pokemob.move.sweetscent": "甜甜香气",
-    "pokemob.move.swift": "高速星星",
-    "pokemob.move.switcheroo": "掉包",
-    "pokemob.move.swordsdance": "剑舞",
-    "pokemob.move.synchronoise": "同步干扰",
-    "pokemob.move.synthesis": "光合作用",
-    "pokemob.move.tackle": "撞击",
-    "pokemob.move.tailglow": "萤火",
-    "pokemob.move.tailslap": "扫尾拍打",
-    "pokemob.move.tailwhip": "摇尾巴",
-    "pokemob.move.tailwind": "顺风",
-    "pokemob.move.takedown": "猛撞",
-    "pokemob.move.taunt": "挑衅",
-    "pokemob.move.tearfullook": "泪眼汪汪",
-    "pokemob.move.technoblast": "高科技光炮",
-    "pokemob.move.tectonicrage": "地隆啸天大终结",
-    "pokemob.move.teeterdance": "摇晃舞",
-    "pokemob.move.telekinesis": "意念移物",
-    "pokemob.move.teleport": "瞬间移动",
-    "pokemob.move.thief": "小偷",
-    "pokemob.move.thousandarrows": "千箭齐发",
-    "pokemob.move.thousandwaves": "千波激荡",
-    "pokemob.move.thrash": "大闹一番",
-    "pokemob.move.throatchop": "地狱突刺",
-    "pokemob.move.thunder": "打雷",
-    "pokemob.move.thunderbolt": "十万伏特",
-    "pokemob.move.thunderfang": "雷电牙",
-    "pokemob.move.thunderpunch": "雷电拳",
-    "pokemob.move.thundershock": "电击",
-    "pokemob.move.thunderwave": "电磁波",
-    "pokemob.move.tickle": "挠痒",
-    "pokemob.move.topsyturvy": "颠倒",
-    "pokemob.move.torment": "无理取闹",
-    "pokemob.move.toxic": "剧毒",
-    "pokemob.move.toxicspikes": "毒菱",
-    "pokemob.move.toxicthread": "毒丝",
-    "pokemob.move.transform": "变身",
-    "pokemob.move.triattack": "三重攻击",
-    "pokemob.move.trick": "戏法",
-    "pokemob.move.trickortreat": "万圣夜",
-    "pokemob.move.trickroom": "戏法空间",
-    "pokemob.move.triplekick": "三连踢",
-    "pokemob.move.tropkick": "热带踢",
-    "pokemob.move.trumpcard": "王牌",
-    "pokemob.move.twineedle": "双针",
-    "pokemob.move.twinkletackle": "可爱星星飞天撞",
-    "pokemob.move.twister": "龙卷风",
-    "pokemob.move.uproar": "吵闹",
-    "pokemob.move.uturn": "急速折返",
-    "pokemob.move.vacuumwave": "真空波",
-    "pokemob.move.vcreate": "Ｖ热焰",
-    "pokemob.move.venomdrench": "毒液陷阱",
-    "pokemob.move.venoshock": "毒液冲击",
-    "pokemob.move.vicegrip": "夹住",
-    "pokemob.move.vinewhip": "藤鞭",
-    "pokemob.move.vitalthrow": "借力摔",
-    "pokemob.move.voltswitch": "伏特替换",
-    "pokemob.move.volttackle": "伏特攻击",
-    "pokemob.move.wakeupslap": "唤醒巴掌",
-    "pokemob.move.waterfall": "攀瀑",
-    "pokemob.move.watergun": "水枪",
-    "pokemob.move.waterpledge": "水之誓约",
-    "pokemob.move.waterpulse": "水之波动",
-    "pokemob.move.watershuriken": "飞水手里剑",
-    "pokemob.move.watersport": "玩水",
-    "pokemob.move.waterspout": "喷水",
-    "pokemob.move.weatherball": "气象球",
-    "pokemob.move.whirlpool": "潮旋",
-    "pokemob.move.whirlwind": "吹飞",
-    "pokemob.move.wideguard": "广域防守",
-    "pokemob.move.wildcharge": "疯狂伏特",
-    "pokemob.move.willowisp": "鬼火",
-    "pokemob.move.wingattack": "翅膀攻击",
-    "pokemob.move.wish": "祈愿",
-    "pokemob.move.withdraw": "缩入壳中",
-    "pokemob.move.wonderroom": "奇妙空间",
-    "pokemob.move.woodhammer": "木槌",
-    "pokemob.move.workup": "自我激励",
-    "pokemob.move.worryseed": "烦恼种子",
-    "pokemob.move.wrap": "紧束",
-    "pokemob.move.wringout": "绞紧",
-    "pokemob.move.xscissor": "十字剪",
-    "pokemob.move.yawn": "哈欠",
-    "pokemob.move.zapcannon": "电磁炮",
-    "pokemob.move.zenheadbutt": "意念头锤",
-    "pokemob.move.zingzap": "麻麻刺刺",
-    "pokemob.move.bouncybubble": "活活气泡",
-    "pokemob.move.buzzybuzz": "麻麻电击",
-    "pokemob.move.sizzlyslide": "熊熊火爆",
-    "pokemob.move.glitzyglow": "哗哗气场",
-    "pokemob.move.baddybad": "坏坏领域",
-    "pokemob.move.sappyseed": "茁茁轰炸",
-    "pokemob.move.freezyfrost": "冰冰霜冻",
-    "pokemob.move.sparklyswirl": "亮亮风暴",
-    "pokemob.move.veeveevolley": "砰砰擊破",
-    "pokemob.move.zippyzap": "电电加速",
-    "pokemob.move.splishysplash": "滔滔冲浪",
-    "pokemob.move.floatyfall": "飘飘坠落",
-    "pokemob.move.pikapapow": "闪闪雷光",
-    "pokemob.move.lightthatburnsthesky": "焚天灭世炽光爆",
-    "pokemob.move.dynamaxcannon": "极巨炮",
-    "pokemob.move.snipeshot": "狙击",
-    "pokemob.move.jawlock": "紧咬不放",
-    "pokemob.move.stuffcheeks": "大快朵颐",
-    "pokemob.move.noretreat": "背水一战",
-    "pokemob.move.tarshot": "沥青射击",
-    "pokemob.move.magicpowder": "魔法粉",
-    "pokemob.move.dragondarts": "龙箭",
-    "pokemob.move.teatime": "茶会",
-    "pokemob.move.octolock": "蛸固",
-    "pokemob.move.boltbeak": "电喙",
-    "pokemob.move.fishiousrend": "鳃咬",
-    "pokemob.move.courtchange": "换场",
-    "pokemob.move.clangoroussoul": "魂舞烈音爆",
-    "pokemob.move.bodypress": "扑击",
-    "pokemob.move.decorate": "装饰",
-    "pokemob.move.drumbeating": "鼓击",
-    "pokemob.move.snaptrap": "捕兽夹",
-    "pokemob.move.pyroball": "火焰球",
-    "pokemob.move.behemothblade": "巨兽斩",
-    "pokemob.move.behemothbash": "巨兽弹",
-    "pokemob.move.aurawheel": "气场轮",
-    "pokemob.move.breakingswipe": "广域破坏",
-    "pokemob.move.branchpoke": "木枝突刺",
-    "pokemob.move.overdrive": "破音",
-    "pokemob.move.appleacid": "苹果酸",
-    "pokemob.move.gravapple": "万有引力",
-    "pokemob.move.spiritbreak": "灵魂冲击",
-    "pokemob.move.strangesteam": "神奇蒸汽",
-    "pokemob.move.lifedew": "生命水滴",
-    "pokemob.move.obstruct": "拦堵",
-    "pokemob.move.falsesurrender": "假跪真撞",
-    "pokemob.move.meteorassault": "流星突击",
-    "pokemob.move.eternabeam": "无极光束",
-    "pokemob.move.steelbeam": "铁蹄光线",
-    "pokemob.move.expandingforce": "广域战力",
-    "pokemob.move.steelroller": "铁滚轮",
-    "pokemob.move.scaleshot": "鳞射",
-    "pokemob.move.meteorbeam": "流星光束",
-    "pokemob.move.shellsidearm": "臂贝武器",
-    "pokemob.move.mistyexplosion": "薄雾炸裂",
-    "pokemob.move.grassyglide": "青草滑梯",
-    "pokemob.move.risingvoltage": "电力上升",
-    "pokemob.move.terrainpulse": "大地波动",
-    "pokemob.move.skittersmack": "爬击",
-    "pokemob.move.burningjealousy": "妒火",
-    "pokemob.move.lashout": "泄愤",
-    "pokemob.move.poltergeist": "灵骚",
-    "pokemob.move.corrosivegas": "腐蚀气体",
-    "pokemob.move.coaching": "指导",
-    "pokemob.move.flipturn": "快速折返",
-    "pokemob.move.tripleaxel": "三旋击",
-    "pokemob.move.dualwingbeat": "双翼",
-    "pokemob.move.scorchingsands": "热沙大地",
-    "pokemob.move.junglehealing": "丛林治疗",
-    "pokemob.move.wickedblow": "暗冥强击",
-    "pokemob.move.surgingstrikes": "水流连打",
-    "pokemob.move.thundercage": "雷电囚笼",
-    "pokemob.move.dragonenergy": "巨龙威能",
-    "pokemob.move.freezingglare": "冰冷视线",
-    "pokemob.move.fierywrath": "怒火中烧",
-    "pokemob.move.thunderouskick": "雷鸣蹴击",
-    "pokemob.move.glaciallance": "雪矛",
-    "pokemob.move.astralbarrage": "星碎",
-    "pokemob.move.eeriespell": "诡异咒语",
-    "pokemob.move.visegrip": "夹住",
-    "pokemob.move.barbbarrage": "毒千针",
-    "pokemob.move.bittermalice": "冤冤相报",
-    "pokemob.move.bleakwindstorm": "枯叶风暴",
-    "pokemob.move.ceaselessedge": "秘剑・千重涛",
-    "pokemob.move.chloroblast": "叶绿爆震",
-    "pokemob.move.direclaw": "克命爪",
-    "pokemob.move.esperwing": "气场之翼",
-    "pokemob.move.headlongrush": "突飞猛扑",
-    "pokemob.move.infernalparade": "群魔乱舞",
-    "pokemob.move.lunarblessing": "新月祈祷",
-    "pokemob.move.mountaingale": "冰山风",
-    "pokemob.move.mysticalpower": "神秘之力",
-    "pokemob.move.powershift": "力量转换",
-    "pokemob.move.psyshieldbash": "屏障猛攻",
-    "pokemob.move.ragingfury": "大愤慨",
-    "pokemob.move.sandsearstorm": "热沙风暴",
-    "pokemob.move.shelter": "闭关",
-    "pokemob.move.springtidestorm": "阳春风暴",
-    "pokemob.move.stoneaxe": "岩斧",
-    "pokemob.move.takeheart": "勇气填充",
-    "pokemob.move.triplearrows": "三连箭",
-    "pokemob.move.victorydance": "胜利之舞",
-    "pokemob.move.wavecrash": "波动冲",
-    "pokemob.move.wildboltstorm": "鸣雷风暴",
-    "pokemob.move.maxflare": "极巨火爆",
-    "pokemob.move.maxflutterby": "极巨虫蛊",
-    "pokemob.move.maxlightning": "极巨闪电",
-    "pokemob.move.maxstrike": "极巨攻击",
-    "pokemob.move.maxknuckle": "极巨拳斗",
-    "pokemob.move.maxphantasm": "极巨幽魂",
-    "pokemob.move.maxhailstorm": "极巨寒冰",
-    "pokemob.move.maxooze": "极巨酸毒",
-    "pokemob.move.maxgeyser": "极巨水流",
-    "pokemob.move.maxairstream": "极巨飞冲",
-    "pokemob.move.maxstarfall": "极巨妖精",
-    "pokemob.move.maxwyrmwind": "极巨龙骑",
-    "pokemob.move.maxmindstorm": "极巨超能",
-    "pokemob.move.maxrockfall": "极巨岩石",
-    "pokemob.move.maxquake": "极巨大地",
-    "pokemob.move.maxdarkness": "极巨恶霸",
-    "pokemob.move.maxovergrowth": "极巨草原",
-    "pokemob.move.maxsteelspike": "极巨钢铁",
-    "pokemob.move.gmaxwildfire": "超极巨地狱灭焰",
-    "pokemob.move.gmaxbefuddle": "超极巨蝶影蛊惑",
-    "pokemob.move.gmaxvoltcrash": "超极巨万雷轰顶",
-    "pokemob.move.gmaxgoldrush": "超极巨特大金币",
-    "pokemob.move.gmaxchistrike": "超极巨会心一击",
-    "pokemob.move.gmaxterror": "超极巨幻影幽魂",
-    "pokemob.move.gmaxresonance": "超极巨极光旋律",
-    "pokemob.move.gmaxcuddle": "超极巨热情拥抱",
-    "pokemob.move.gmaxreplenish": "超极巨资源再生",
-    "pokemob.move.gmaxmalodor": "超极巨臭气冲天",
-    "pokemob.move.gmaxstonesurge": "超极巨岩阵以待",
-    "pokemob.move.gmaxwindrage": "超极巨旋风袭卷",
-    "pokemob.move.gmaxstunshock": "超极巨异毒电场",
-    "pokemob.move.gmaxfinale": "超极巨幸福圆满",
-    "pokemob.move.gmaxdepletion": "超极巨劣化衰变",
-    "pokemob.move.gmaxgravitas": "超极巨天道七星",
-    "pokemob.move.gmaxvolcalith": "超极巨炎石喷发",
-    "pokemob.move.gmaxsandblast": "超极巨沙尘漫天",
-    "pokemob.move.gmaxsnooze": "超极巨睡魔降临",
-    "pokemob.move.gmaxtartness": "超极巨酸不溜丟",
-    "pokemob.move.gmaxsweetness": "超极巨琼浆玉液",
-    "pokemob.move.gmaxsmite": "超极巨天谴雷诛",
-    "pokemob.move.gmaxsteelsurge": "超极巨钢铁阵法",
-    "pokemob.move.gmaxmeltdown": "超极巨液金熔击",
-    "pokemob.move.gmaxfoamburst": "超极巨激漩泡涡",
-    "pokemob.move.gmaxcentiferno": "超极巨百火焚野",
-    "pokemob.move.gmaxfireball": "超极巨破阵火球",
-    "pokemob.move.gmaxdrumsolo": "超极巨狂擂乱打",
-    "pokemob.move.gmaxhydrosnipe": "超极巨狙击神射",
-    "pokemob.move.gmaxoneblow": "超极巨夺命一击",
-    "pokemob.move.gmaxrapidflow": "超极巨流水连击",
-    "pokemob.move.gmaxvinelash": "超极巨灰飞鞭灭",
-    "pokemob.move.gmaxcannonade": "超极巨水炮轰灭"
-}
+  "pokemob.move.pound": "拍击",
+  "pokemob.move.karate-chop": "空手劈",
+  "pokemob.move.double-slap": "连环巴掌",
+  "pokemob.move.comet-punch": "连续拳",
+  "pokemob.move.mega-punch": "百万吨重拳",
+  "pokemob.move.pay-day": "聚宝功",
+  "pokemob.move.fire-punch": "火焰拳",
+  "pokemob.move.ice-punch": "冰冻拳",
+  "pokemob.move.thunder-punch": "雷电拳",
+  "pokemob.move.scratch": "抓",
+  "pokemob.move.vice-grip": "夹住",
+  "pokemob.move.guillotine": "断头钳",
+  "pokemob.move.razor-wind": "旋风刀",
+  "pokemob.move.swords-dance": "剑舞",
+  "pokemob.move.cut": "居合斩",
+  "pokemob.move.gust": "起风",
+  "pokemob.move.wing-attack": "翅膀攻击",
+  "pokemob.move.whirlwind": "吹飞",
+  "pokemob.move.fly": "飞翔",
+  "pokemob.move.bind": "绑紧",
+  "pokemob.move.slam": "摔打",
+  "pokemob.move.vine-whip": "藤鞭",
+  "pokemob.move.stomp": "踩踏",
+  "pokemob.move.double-kick": "二连踢",
+  "pokemob.move.mega-kick": "百万吨重踢",
+  "pokemob.move.jump-kick": "飞踢",
+  "pokemob.move.rolling-kick": "回旋踢",
+  "pokemob.move.sand-attack": "泼沙",
+  "pokemob.move.headbutt": "头锤",
+  "pokemob.move.horn-attack": "角撞",
+  "pokemob.move.fury-attack": "乱击",
+  "pokemob.move.horn-drill": "角钻",
+  "pokemob.move.tackle": "撞击",
+  "pokemob.move.body-slam": "泰山压顶",
+  "pokemob.move.wrap": "紧束",
+  "pokemob.move.take-down": "猛撞",
+  "pokemob.move.thrash": "大闹一番",
+  "pokemob.move.double-edge": "舍身冲撞",
+  "pokemob.move.tail-whip": "摇尾巴",
+  "pokemob.move.poison-sting": "毒针",
+  "pokemob.move.twineedle": "双针",
+  "pokemob.move.pin-missile": "飞弹针",
+  "pokemob.move.leer": "瞪眼",
+  "pokemob.move.bite": "咬住",
+  "pokemob.move.growl": "叫声",
+  "pokemob.move.roar": "吼叫",
+  "pokemob.move.sing": "唱歌",
+  "pokemob.move.supersonic": "超音波",
+  "pokemob.move.sonic-boom": "音爆",
+  "pokemob.move.disable": "定身法",
+  "pokemob.move.acid": "溶解液",
+  "pokemob.move.ember": "火花",
+  "pokemob.move.flamethrower": "喷射火焰",
+  "pokemob.move.mist": "白雾",
+  "pokemob.move.water-gun": "水枪",
+  "pokemob.move.hydro-pump": "水炮",
+  "pokemob.move.surf": "冲浪",
+  "pokemob.move.ice-beam": "冰冻光束",
+  "pokemob.move.blizzard": "暴风雪",
+  "pokemob.move.psybeam": "幻象光线",
+  "pokemob.move.bubble-beam": "泡沫光线",
+  "pokemob.move.aurora-beam": "极光束",
+  "pokemob.move.hyper-beam": "破坏光线",
+  "pokemob.move.peck": "啄",
+  "pokemob.move.drill-peck": "啄钻",
+  "pokemob.move.submission": "地狱翻滚",
+  "pokemob.move.low-kick": "踢倒",
+  "pokemob.move.counter": "双倍奉还",
+  "pokemob.move.seismic-toss": "地球上投",
+  "pokemob.move.strength": "怪力",
+  "pokemob.move.absorb": "吸取",
+  "pokemob.move.mega-drain": "超级吸取",
+  "pokemob.move.leech-seed": "寄生种子",
+  "pokemob.move.growth": "生长",
+  "pokemob.move.razor-leaf": "飞叶快刀",
+  "pokemob.move.solar-beam": "日光束",
+  "pokemob.move.poison-powder": "毒粉",
+  "pokemob.move.stun-spore": "麻痹粉",
+  "pokemob.move.sleep-powder": "催眠粉",
+  "pokemob.move.petal-dance": "花瓣舞",
+  "pokemob.move.string-shot": "吐丝",
+  "pokemob.move.dragon-rage": "龙之怒",
+  "pokemob.move.fire-spin": "火焰旋涡",
+  "pokemob.move.thunder-shock": "电击",
+  "pokemob.move.thunderbolt": "十万伏特",
+  "pokemob.move.thunder-wave": "电磁波",
+  "pokemob.move.thunder": "打雷",
+  "pokemob.move.rock-throw": "落石",
+  "pokemob.move.earthquake": "地震",
+  "pokemob.move.fissure": "地裂",
+  "pokemob.move.dig": "挖洞",
+  "pokemob.move.toxic": "剧毒",
+  "pokemob.move.confusion": "念力",
+  "pokemob.move.psychic": "精神强念",
+  "pokemob.move.hypnosis": "催眠术",
+  "pokemob.move.meditate": "瑜伽姿势",
+  "pokemob.move.agility": "高速移动",
+  "pokemob.move.quick-attack": "电光一闪",
+  "pokemob.move.rage": "愤怒",
+  "pokemob.move.teleport": "瞬间移动",
+  "pokemob.move.night-shade": "黑夜魔影",
+  "pokemob.move.mimic": "模仿",
+  "pokemob.move.screech": "刺耳声",
+  "pokemob.move.double-team": "影子分身",
+  "pokemob.move.recover": "自我再生",
+  "pokemob.move.harden": "变硬",
+  "pokemob.move.minimize": "变小",
+  "pokemob.move.smokescreen": "烟幕",
+  "pokemob.move.confuse-ray": "奇异之光",
+  "pokemob.move.withdraw": "缩入壳中",
+  "pokemob.move.defense-curl": "变圆",
+  "pokemob.move.barrier": "屏障",
+  "pokemob.move.light-screen": "光墙",
+  "pokemob.move.haze": "黑雾",
+  "pokemob.move.reflect": "反射壁",
+  "pokemob.move.focus-energy": "聚气",
+  "pokemob.move.bide": "忍耐",
+  "pokemob.move.metronome": "挥指",
+  "pokemob.move.mirror-move": "鹦鹉学舌",
+  "pokemob.move.self-destruct": "自爆",
+  "pokemob.move.egg-bomb": "炸蛋",
+  "pokemob.move.lick": "舌舔",
+  "pokemob.move.smog": "浊雾",
+  "pokemob.move.sludge": "污泥攻击",
+  "pokemob.move.bone-club": "骨棒",
+  "pokemob.move.fire-blast": "大字爆炎",
+  "pokemob.move.waterfall": "攀瀑",
+  "pokemob.move.clamp": "贝壳夹击",
+  "pokemob.move.swift": "高速星星",
+  "pokemob.move.skull-bash": "火箭头锤",
+  "pokemob.move.spike-cannon": "尖刺加农炮",
+  "pokemob.move.constrict": "缠绕",
+  "pokemob.move.amnesia": "瞬间失忆",
+  "pokemob.move.kinesis": "折弯汤匙",
+  "pokemob.move.soft-boiled": "生蛋",
+  "pokemob.move.high-jump-kick": "飞膝踢",
+  "pokemob.move.glare": "大蛇瞪眼",
+  "pokemob.move.dream-eater": "食梦",
+  "pokemob.move.poison-gas": "毒瓦斯",
+  "pokemob.move.barrage": "投球",
+  "pokemob.move.leech-life": "吸血",
+  "pokemob.move.lovely-kiss": "恶魔之吻",
+  "pokemob.move.sky-attack": "神鸟猛击",
+  "pokemob.move.transform": "变身",
+  "pokemob.move.bubble": "泡沫",
+  "pokemob.move.dizzy-punch": "迷昏拳",
+  "pokemob.move.spore": "蘑菇孢子",
+  "pokemob.move.flash": "闪光",
+  "pokemob.move.psywave": "精神波",
+  "pokemob.move.splash": "跃起",
+  "pokemob.move.acid-armor": "溶化",
+  "pokemob.move.crabhammer": "蟹钳锤",
+  "pokemob.move.explosion": "大爆炸",
+  "pokemob.move.fury-swipes": "乱抓",
+  "pokemob.move.bonemerang": "骨头回力镖",
+  "pokemob.move.rest": "睡觉",
+  "pokemob.move.rock-slide": "岩崩",
+  "pokemob.move.hyper-fang": "必杀门牙",
+  "pokemob.move.sharpen": "棱角化",
+  "pokemob.move.conversion": "纹理",
+  "pokemob.move.tri-attack": "三重攻击",
+  "pokemob.move.super-fang": "愤怒门牙",
+  "pokemob.move.slash": "劈开",
+  "pokemob.move.substitute": "替身",
+  "pokemob.move.struggle": "挣扎",
+  "pokemob.move.sketch": "写生",
+  "pokemob.move.triple-kick": "三连踢",
+  "pokemob.move.thief": "小偷",
+  "pokemob.move.spider-web": "蛛网",
+  "pokemob.move.mind-reader": "心之眼",
+  "pokemob.move.nightmare": "恶梦",
+  "pokemob.move.flame-wheel": "火焰轮",
+  "pokemob.move.snore": "打鼾",
+  "pokemob.move.curse": "诅咒",
+  "pokemob.move.flail": "抓狂",
+  "pokemob.move.conversion-2": "纹理２",
+  "pokemob.move.aeroblast": "气旋攻击",
+  "pokemob.move.cotton-spore": "棉孢子",
+  "pokemob.move.reversal": "起死回生",
+  "pokemob.move.spite": "怨恨",
+  "pokemob.move.powder-snow": "细雪",
+  "pokemob.move.protect": "守住",
+  "pokemob.move.mach-punch": "音速拳",
+  "pokemob.move.scary-face": "鬼面",
+  "pokemob.move.feint-attack": "出奇一击",
+  "pokemob.move.sweet-kiss": "天使之吻",
+  "pokemob.move.belly-drum": "腹鼓",
+  "pokemob.move.sludge-bomb": "污泥炸弹",
+  "pokemob.move.mud-slap": "掷泥",
+  "pokemob.move.octazooka": "章鱼桶炮",
+  "pokemob.move.spikes": "撒菱",
+  "pokemob.move.zap-cannon": "电磁炮",
+  "pokemob.move.foresight": "识破",
+  "pokemob.move.destiny-bond": "同命",
+  "pokemob.move.perish-song": "灭亡之歌",
+  "pokemob.move.icy-wind": "冰冻之风",
+  "pokemob.move.detect": "看穿",
+  "pokemob.move.bone-rush": "骨棒乱打",
+  "pokemob.move.lock-on": "锁定",
+  "pokemob.move.outrage": "逆鳞",
+  "pokemob.move.sandstorm": "沙暴",
+  "pokemob.move.giga-drain": "终极吸取",
+  "pokemob.move.endure": "挺住",
+  "pokemob.move.charm": "撒娇",
+  "pokemob.move.rollout": "滚动",
+  "pokemob.move.false-swipe": "点到为止",
+  "pokemob.move.swagger": "虚张声势",
+  "pokemob.move.milk-drink": "喝牛奶",
+  "pokemob.move.spark": "电光",
+  "pokemob.move.fury-cutter": "连斩",
+  "pokemob.move.steel-wing": "钢翼",
+  "pokemob.move.mean-look": "黑色目光",
+  "pokemob.move.attract": "迷人",
+  "pokemob.move.sleep-talk": "梦话",
+  "pokemob.move.heal-bell": "治愈铃声",
+  "pokemob.move.return": "报恩",
+  "pokemob.move.present": "礼物",
+  "pokemob.move.frustration": "迁怒",
+  "pokemob.move.safeguard": "神秘守护",
+  "pokemob.move.pain-split": "分担痛楚",
+  "pokemob.move.sacred-fire": "神圣之火",
+  "pokemob.move.magnitude": "震级",
+  "pokemob.move.dynamic-punch": "爆裂拳",
+  "pokemob.move.megahorn": "超级角击",
+  "pokemob.move.dragon-breath": "龙息",
+  "pokemob.move.baton-pass": "接棒",
+  "pokemob.move.encore": "再来一次",
+  "pokemob.move.pursuit": "追打",
+  "pokemob.move.rapid-spin": "高速旋转",
+  "pokemob.move.sweet-scent": "甜甜香气",
+  "pokemob.move.iron-tail": "铁尾",
+  "pokemob.move.metal-claw": "金属爪",
+  "pokemob.move.vital-throw": "借力摔",
+  "pokemob.move.morning-sun": "晨光",
+  "pokemob.move.synthesis": "光合作用",
+  "pokemob.move.moonlight": "月光",
+  "pokemob.move.hidden-power": "觉醒力量",
+  "pokemob.move.cross-chop": "十字劈",
+  "pokemob.move.twister": "龙卷风",
+  "pokemob.move.rain-dance": "求雨",
+  "pokemob.move.sunny-day": "大晴天",
+  "pokemob.move.crunch": "咬碎",
+  "pokemob.move.mirror-coat": "镜面反射",
+  "pokemob.move.psych-up": "自我暗示",
+  "pokemob.move.extreme-speed": "神速",
+  "pokemob.move.ancient-power": "原始之力",
+  "pokemob.move.shadow-ball": "暗影球",
+  "pokemob.move.future-sight": "预知未来",
+  "pokemob.move.rock-smash": "碎岩",
+  "pokemob.move.whirlpool": "潮旋",
+  "pokemob.move.beat-up": "围攻",
+  "pokemob.move.fake-out": "击掌奇袭",
+  "pokemob.move.uproar": "吵闹",
+  "pokemob.move.stockpile": "蓄力",
+  "pokemob.move.spit-up": "喷出",
+  "pokemob.move.swallow": "吞下",
+  "pokemob.move.heat-wave": "热风",
+  "pokemob.move.hail": "冰雹",
+  "pokemob.move.torment": "无理取闹",
+  "pokemob.move.flatter": "吹捧",
+  "pokemob.move.will-o-wisp": "鬼火",
+  "pokemob.move.memento": "临别礼物",
+  "pokemob.move.facade": "硬撑",
+  "pokemob.move.focus-punch": "真气拳",
+  "pokemob.move.smelling-salts": "清醒",
+  "pokemob.move.follow-me": "看我嘛",
+  "pokemob.move.nature-power": "自然之力",
+  "pokemob.move.charge": "充电",
+  "pokemob.move.taunt": "挑衅",
+  "pokemob.move.helping-hand": "帮助",
+  "pokemob.move.trick": "戏法",
+  "pokemob.move.role-play": "扮演",
+  "pokemob.move.wish": "祈愿",
+  "pokemob.move.assist": "借助",
+  "pokemob.move.ingrain": "扎根",
+  "pokemob.move.superpower": "蛮力",
+  "pokemob.move.magic-coat": "魔法反射",
+  "pokemob.move.recycle": "回收利用",
+  "pokemob.move.revenge": "报复",
+  "pokemob.move.brick-break": "劈瓦",
+  "pokemob.move.yawn": "哈欠",
+  "pokemob.move.knock-off": "拍落",
+  "pokemob.move.endeavor": "蛮干",
+  "pokemob.move.eruption": "喷火",
+  "pokemob.move.skill-swap": "特性互换",
+  "pokemob.move.imprison": "封印",
+  "pokemob.move.refresh": "焕然一新",
+  "pokemob.move.grudge": "怨念",
+  "pokemob.move.snatch": "抢夺",
+  "pokemob.move.secret-power": "秘密之力",
+  "pokemob.move.dive": "潜水",
+  "pokemob.move.arm-thrust": "猛推",
+  "pokemob.move.camouflage": "保护色",
+  "pokemob.move.tail-glow": "萤火",
+  "pokemob.move.luster-purge": "洁净光芒",
+  "pokemob.move.mist-ball": "薄雾球",
+  "pokemob.move.feather-dance": "羽毛舞",
+  "pokemob.move.teeter-dance": "摇晃舞",
+  "pokemob.move.blaze-kick": "火焰踢",
+  "pokemob.move.mud-sport": "玩泥巴",
+  "pokemob.move.ice-ball": "冰球",
+  "pokemob.move.needle-arm": "尖刺臂",
+  "pokemob.move.slack-off": "偷懒",
+  "pokemob.move.hyper-voice": "巨声",
+  "pokemob.move.poison-fang": "剧毒牙",
+  "pokemob.move.crush-claw": "撕裂爪",
+  "pokemob.move.blast-burn": "爆炸烈焰",
+  "pokemob.move.hydro-cannon": "加农水炮",
+  "pokemob.move.meteor-mash": "彗星拳",
+  "pokemob.move.astonish": "惊吓",
+  "pokemob.move.weather-ball": "气象球",
+  "pokemob.move.aromatherapy": "芳香治疗",
+  "pokemob.move.fake-tears": "假哭",
+  "pokemob.move.air-cutter": "空气利刃",
+  "pokemob.move.overheat": "过热",
+  "pokemob.move.odor-sleuth": "气味侦测",
+  "pokemob.move.rock-tomb": "岩石封锁",
+  "pokemob.move.silver-wind": "银色旋风",
+  "pokemob.move.metal-sound": "金属音",
+  "pokemob.move.grass-whistle": "草笛",
+  "pokemob.move.tickle": "挠痒",
+  "pokemob.move.cosmic-power": "宇宙力量",
+  "pokemob.move.water-spout": "喷水",
+  "pokemob.move.signal-beam": "信号光束",
+  "pokemob.move.shadow-punch": "暗影拳",
+  "pokemob.move.extrasensory": "神通力",
+  "pokemob.move.sky-uppercut": "冲天拳",
+  "pokemob.move.sand-tomb": "流沙地狱",
+  "pokemob.move.sheer-cold": "绝对零度",
+  "pokemob.move.muddy-water": "浊流",
+  "pokemob.move.bullet-seed": "种子机关枪",
+  "pokemob.move.aerial-ace": "燕返",
+  "pokemob.move.icicle-spear": "冰锥",
+  "pokemob.move.iron-defense": "铁壁",
+  "pokemob.move.block": "挡路",
+  "pokemob.move.howl": "长嚎",
+  "pokemob.move.dragon-claw": "龙爪",
+  "pokemob.move.frenzy-plant": "疯狂植物",
+  "pokemob.move.bulk-up": "健美",
+  "pokemob.move.bounce": "弹跳",
+  "pokemob.move.mud-shot": "泥巴射击",
+  "pokemob.move.poison-tail": "毒尾",
+  "pokemob.move.covet": "渴望",
+  "pokemob.move.volt-tackle": "伏特攻击",
+  "pokemob.move.magical-leaf": "魔法叶",
+  "pokemob.move.water-sport": "玩水",
+  "pokemob.move.calm-mind": "冥想",
+  "pokemob.move.leaf-blade": "叶刃",
+  "pokemob.move.dragon-dance": "龙之舞",
+  "pokemob.move.rock-blast": "岩石爆击",
+  "pokemob.move.shock-wave": "电击波",
+  "pokemob.move.water-pulse": "水之波动",
+  "pokemob.move.doom-desire": "破灭之愿",
+  "pokemob.move.psycho-boost": "精神突进",
+  "pokemob.move.roost": "羽栖",
+  "pokemob.move.gravity": "重力",
+  "pokemob.move.miracle-eye": "奇迹之眼",
+  "pokemob.move.wake-up-slap": "唤醒巴掌",
+  "pokemob.move.hammer-arm": "臂锤",
+  "pokemob.move.gyro-ball": "陀螺球",
+  "pokemob.move.healing-wish": "治愈之愿",
+  "pokemob.move.brine": "盐水",
+  "pokemob.move.natural-gift": "自然之恩",
+  "pokemob.move.feint": "佯攻",
+  "pokemob.move.pluck": "啄食",
+  "pokemob.move.tailwind": "顺风",
+  "pokemob.move.acupressure": "点穴",
+  "pokemob.move.metal-burst": "金属爆炸",
+  "pokemob.move.u-turn": "急速折返",
+  "pokemob.move.close-combat": "近身战",
+  "pokemob.move.payback": "以牙还牙",
+  "pokemob.move.assurance": "恶意追击",
+  "pokemob.move.embargo": "查封",
+  "pokemob.move.fling": "投掷",
+  "pokemob.move.psycho-shift": "精神转移",
+  "pokemob.move.trump-card": "王牌",
+  "pokemob.move.heal-block": "回复封锁",
+  "pokemob.move.wring-out": "绞紧",
+  "pokemob.move.power-trick": "力量戏法",
+  "pokemob.move.gastro-acid": "胃液",
+  "pokemob.move.lucky-chant": "幸运咒语",
+  "pokemob.move.me-first": "抢先一步",
+  "pokemob.move.copycat": "仿效",
+  "pokemob.move.power-swap": "力量互换",
+  "pokemob.move.guard-swap": "防守互换",
+  "pokemob.move.punishment": "惩罚",
+  "pokemob.move.last-resort": "珍藏",
+  "pokemob.move.worry-seed": "烦恼种子",
+  "pokemob.move.sucker-punch": "突袭",
+  "pokemob.move.toxic-spikes": "毒菱",
+  "pokemob.move.heart-swap": "心灵互换",
+  "pokemob.move.aqua-ring": "水流环",
+  "pokemob.move.magnet-rise": "电磁飘浮",
+  "pokemob.move.flare-blitz": "闪焰冲锋",
+  "pokemob.move.force-palm": "发劲",
+  "pokemob.move.aura-sphere": "波导弹",
+  "pokemob.move.rock-polish": "岩石打磨",
+  "pokemob.move.poison-jab": "毒击",
+  "pokemob.move.dark-pulse": "恶之波动",
+  "pokemob.move.night-slash": "暗袭要害",
+  "pokemob.move.aqua-tail": "水流尾",
+  "pokemob.move.seed-bomb": "种子炸弹",
+  "pokemob.move.air-slash": "空气斩",
+  "pokemob.move.x-scissor": "十字剪",
+  "pokemob.move.bug-buzz": "虫鸣",
+  "pokemob.move.dragon-pulse": "龙之波动",
+  "pokemob.move.dragon-rush": "龙之俯冲",
+  "pokemob.move.power-gem": "力量宝石",
+  "pokemob.move.drain-punch": "吸取拳",
+  "pokemob.move.vacuum-wave": "真空波",
+  "pokemob.move.focus-blast": "真气弹",
+  "pokemob.move.energy-ball": "能量球",
+  "pokemob.move.brave-bird": "勇鸟猛攻",
+  "pokemob.move.earth-power": "大地之力",
+  "pokemob.move.switcheroo": "掉包",
+  "pokemob.move.giga-impact": "终极冲击",
+  "pokemob.move.nasty-plot": "诡计",
+  "pokemob.move.bullet-punch": "子弹拳",
+  "pokemob.move.avalanche": "雪崩",
+  "pokemob.move.ice-shard": "冰砾",
+  "pokemob.move.shadow-claw": "暗影爪",
+  "pokemob.move.thunder-fang": "雷电牙",
+  "pokemob.move.ice-fang": "冰冻牙",
+  "pokemob.move.fire-fang": "火焰牙",
+  "pokemob.move.shadow-sneak": "影子偷袭",
+  "pokemob.move.mud-bomb": "泥巴炸弹",
+  "pokemob.move.psycho-cut": "精神利刃",
+  "pokemob.move.zen-headbutt": "意念头锤",
+  "pokemob.move.mirror-shot": "镜光射击",
+  "pokemob.move.flash-cannon": "加农光炮",
+  "pokemob.move.rock-climb": "攀岩",
+  "pokemob.move.defog": "清除浓雾",
+  "pokemob.move.trick-room": "戏法空间",
+  "pokemob.move.draco-meteor": "流星群",
+  "pokemob.move.discharge": "放电",
+  "pokemob.move.lava-plume": "喷烟",
+  "pokemob.move.leaf-storm": "飞叶风暴",
+  "pokemob.move.power-whip": "强力鞭打",
+  "pokemob.move.rock-wrecker": "岩石炮",
+  "pokemob.move.cross-poison": "十字毒刃",
+  "pokemob.move.gunk-shot": "垃圾射击",
+  "pokemob.move.iron-head": "铁头",
+  "pokemob.move.magnet-bomb": "磁铁炸弹",
+  "pokemob.move.stone-edge": "尖石攻击",
+  "pokemob.move.captivate": "诱惑",
+  "pokemob.move.stealth-rock": "隐形岩",
+  "pokemob.move.grass-knot": "打草结",
+  "pokemob.move.chatter": "喋喋不休",
+  "pokemob.move.judgment": "制裁光砾",
+  "pokemob.move.bug-bite": "虫咬",
+  "pokemob.move.charge-beam": "充电光束",
+  "pokemob.move.wood-hammer": "木槌",
+  "pokemob.move.aqua-jet": "水流喷射",
+  "pokemob.move.attack-order": "攻击指令",
+  "pokemob.move.defend-order": "防御指令",
+  "pokemob.move.heal-order": "回复指令",
+  "pokemob.move.head-smash": "双刃头锤",
+  "pokemob.move.double-hit": "二连击",
+  "pokemob.move.roar-of-time": "时光咆哮",
+  "pokemob.move.spacial-rend": "亚空裂斩",
+  "pokemob.move.lunar-dance": "新月舞",
+  "pokemob.move.crush-grip": "捏碎",
+  "pokemob.move.magma-storm": "熔岩风暴",
+  "pokemob.move.dark-void": "暗黑洞",
+  "pokemob.move.seed-flare": "种子闪光",
+  "pokemob.move.ominous-wind": "奇异之风",
+  "pokemob.move.shadow-force": "暗影潜袭",
+  "pokemob.move.hone-claws": "磨爪",
+  "pokemob.move.wide-guard": "广域防守",
+  "pokemob.move.guard-split": "防守平分",
+  "pokemob.move.power-split": "力量平分",
+  "pokemob.move.wonder-room": "奇妙空间",
+  "pokemob.move.psyshock": "精神冲击",
+  "pokemob.move.venoshock": "毒液冲击",
+  "pokemob.move.autotomize": "身体轻量化",
+  "pokemob.move.rage-powder": "愤怒粉",
+  "pokemob.move.telekinesis": "意念移物",
+  "pokemob.move.magic-room": "魔法空间",
+  "pokemob.move.smack-down": "击落",
+  "pokemob.move.storm-throw": "山岚摔",
+  "pokemob.move.flame-burst": "烈焰溅射",
+  "pokemob.move.sludge-wave": "污泥波",
+  "pokemob.move.quiver-dance": "蝶舞",
+  "pokemob.move.heavy-slam": "重磅冲撞",
+  "pokemob.move.synchronoise": "同步干扰",
+  "pokemob.move.electro-ball": "电球",
+  "pokemob.move.soak": "浸水",
+  "pokemob.move.flame-charge": "蓄能焰袭",
+  "pokemob.move.coil": "盘蜷",
+  "pokemob.move.low-sweep": "下盘踢",
+  "pokemob.move.acid-spray": "酸液炸弹",
+  "pokemob.move.foul-play": "欺诈",
+  "pokemob.move.simple-beam": "单纯光束",
+  "pokemob.move.entrainment": "找伙伴",
+  "pokemob.move.after-you": "您先请",
+  "pokemob.move.round": "轮唱",
+  "pokemob.move.echoed-voice": "回声",
+  "pokemob.move.chip-away": "逐步击破",
+  "pokemob.move.clear-smog": "清除之烟",
+  "pokemob.move.stored-power": "辅助力量",
+  "pokemob.move.quick-guard": "快速防守",
+  "pokemob.move.ally-switch": "交换场地",
+  "pokemob.move.scald": "热水",
+  "pokemob.move.shell-smash": "破壳",
+  "pokemob.move.heal-pulse": "治愈波动",
+  "pokemob.move.hex": "祸不单行",
+  "pokemob.move.sky-drop": "自由落体",
+  "pokemob.move.shift-gear": "换档",
+  "pokemob.move.circle-throw": "巴投",
+  "pokemob.move.incinerate": "烧尽",
+  "pokemob.move.quash": "延后",
+  "pokemob.move.acrobatics": "杂技",
+  "pokemob.move.reflect-type": "镜面属性",
+  "pokemob.move.retaliate": "报仇",
+  "pokemob.move.final-gambit": "搏命",
+  "pokemob.move.bestow": "传递礼物",
+  "pokemob.move.inferno": "炼狱",
+  "pokemob.move.water-pledge": "水之誓约",
+  "pokemob.move.fire-pledge": "火之誓约",
+  "pokemob.move.grass-pledge": "草之誓约",
+  "pokemob.move.volt-switch": "伏特替换",
+  "pokemob.move.struggle-bug": "虫之抵抗",
+  "pokemob.move.bulldoze": "重踏",
+  "pokemob.move.frost-breath": "冰息",
+  "pokemob.move.dragon-tail": "龙尾",
+  "pokemob.move.work-up": "自我激励",
+  "pokemob.move.electroweb": "电网",
+  "pokemob.move.wild-charge": "疯狂伏特",
+  "pokemob.move.drill-run": "直冲钻",
+  "pokemob.move.dual-chop": "二连劈",
+  "pokemob.move.heart-stamp": "爱心印章",
+  "pokemob.move.horn-leech": "木角",
+  "pokemob.move.sacred-sword": "圣剑",
+  "pokemob.move.razor-shell": "贝壳刃",
+  "pokemob.move.heat-crash": "高温重压",
+  "pokemob.move.leaf-tornado": "青草搅拌器",
+  "pokemob.move.steamroller": "疯狂滚压",
+  "pokemob.move.cotton-guard": "棉花防守",
+  "pokemob.move.night-daze": "暗黑爆破",
+  "pokemob.move.psystrike": "精神击破",
+  "pokemob.move.tail-slap": "扫尾拍打",
+  "pokemob.move.hurricane": "暴风",
+  "pokemob.move.head-charge": "爆炸头突击",
+  "pokemob.move.gear-grind": "齿轮飞盘",
+  "pokemob.move.searing-shot": "火焰弹",
+  "pokemob.move.techno-blast": "高科技光炮",
+  "pokemob.move.relic-song": "古老之歌",
+  "pokemob.move.secret-sword": "神秘之剑",
+  "pokemob.move.glaciate": "冰封世界",
+  "pokemob.move.bolt-strike": "雷击",
+  "pokemob.move.blue-flare": "青焰",
+  "pokemob.move.fiery-dance": "火之舞",
+  "pokemob.move.freeze-shock": "冰冻伏特",
+  "pokemob.move.ice-burn": "极寒冷焰",
+  "pokemob.move.snarl": "大声咆哮",
+  "pokemob.move.icicle-crash": "冰柱坠击",
+  "pokemob.move.v-create": "Ｖ热焰",
+  "pokemob.move.fusion-flare": "交错火焰",
+  "pokemob.move.fusion-bolt": "交错闪电",
+  "pokemob.move.flying-press": "飞身重压",
+  "pokemob.move.mat-block": "掀榻榻米",
+  "pokemob.move.belch": "打嗝",
+  "pokemob.move.rototiller": "耕地",
+  "pokemob.move.sticky-web": "黏黏网",
+  "pokemob.move.fell-stinger": "致命针刺",
+  "pokemob.move.phantom-force": "潜灵奇袭",
+  "pokemob.move.trick-or-treat": "万圣夜",
+  "pokemob.move.noble-roar": "战吼",
+  "pokemob.move.ion-deluge": "等离子浴",
+  "pokemob.move.parabolic-charge": "抛物面充电",
+  "pokemob.move.forests-curse": "森林诅咒",
+  "pokemob.move.petal-blizzard": "落英缤纷",
+  "pokemob.move.freeze-dry": "冷冻干燥",
+  "pokemob.move.disarming-voice": "魅惑之声",
+  "pokemob.move.parting-shot": "抛下狠话",
+  "pokemob.move.topsy-turvy": "颠倒",
+  "pokemob.move.draining-kiss": "吸取之吻",
+  "pokemob.move.crafty-shield": "戏法防守",
+  "pokemob.move.flower-shield": "鲜花防守",
+  "pokemob.move.grassy-terrain": "青草场地",
+  "pokemob.move.misty-terrain": "薄雾场地",
+  "pokemob.move.electrify": "输电",
+  "pokemob.move.play-rough": "嬉闹",
+  "pokemob.move.fairy-wind": "妖精之风",
+  "pokemob.move.moonblast": "月亮之力",
+  "pokemob.move.boomburst": "爆音波",
+  "pokemob.move.fairy-lock": "妖精之锁",
+  "pokemob.move.kings-shield": "王者盾牌",
+  "pokemob.move.play-nice": "和睦相处",
+  "pokemob.move.confide": "密语",
+  "pokemob.move.diamond-storm": "钻石风暴",
+  "pokemob.move.steam-eruption": "蒸汽爆炸",
+  "pokemob.move.hyperspace-hole": "异次元洞",
+  "pokemob.move.water-shuriken": "飞水手里剑",
+  "pokemob.move.mystical-fire": "魔法火焰",
+  "pokemob.move.spiky-shield": "尖刺防守",
+  "pokemob.move.aromatic-mist": "芳香薄雾",
+  "pokemob.move.eerie-impulse": "怪异电波",
+  "pokemob.move.venom-drench": "毒液陷阱",
+  "pokemob.move.powder": "粉尘",
+  "pokemob.move.geomancy": "大地掌控",
+  "pokemob.move.magnetic-flux": "磁场操控",
+  "pokemob.move.happy-hour": "欢乐时光",
+  "pokemob.move.electric-terrain": "电气场地",
+  "pokemob.move.dazzling-gleam": "魔法闪耀",
+  "pokemob.move.celebrate": "庆祝",
+  "pokemob.move.hold-hands": "牵手",
+  "pokemob.move.baby-doll-eyes": "圆瞳",
+  "pokemob.move.nuzzle": "蹭蹭脸颊",
+  "pokemob.move.hold-back": "手下留情",
+  "pokemob.move.infestation": "死缠烂打",
+  "pokemob.move.power-up-punch": "增强拳",
+  "pokemob.move.oblivion-wing": "死亡之翼",
+  "pokemob.move.thousand-arrows": "千箭齐发",
+  "pokemob.move.thousand-waves": "千波激荡",
+  "pokemob.move.lands-wrath": "大地神力",
+  "pokemob.move.light-of-ruin": "破灭之光",
+  "pokemob.move.origin-pulse": "根源波动",
+  "pokemob.move.precipice-blades": "断崖之剑",
+  "pokemob.move.dragon-ascent": "画龙点睛",
+  "pokemob.move.hyperspace-fury": "异次元猛攻",
+  "pokemob.move.breakneck-blitz--physical": "究极无敌大冲撞",
+  "pokemob.move.breakneck-blitz--special": "究极无敌大冲撞",
+  "pokemob.move.all-out-pummeling--physical": "全力无双激烈拳",
+  "pokemob.move.all-out-pummeling--special": "全力无双激烈拳",
+  "pokemob.move.supersonic-skystrike--physical": "极速俯冲轰烈撞",
+  "pokemob.move.supersonic-skystrike--special": "极速俯冲轰烈撞",
+  "pokemob.move.acid-downpour--physical": "强酸剧毒灭绝雨",
+  "pokemob.move.acid-downpour--special": "强酸剧毒灭绝雨",
+  "pokemob.move.tectonic-rage--physical": "地隆啸天大终结",
+  "pokemob.move.tectonic-rage--special": "地隆啸天大终结",
+  "pokemob.move.continental-crush--physical": "毁天灭地巨岩坠",
+  "pokemob.move.continental-crush--special": "毁天灭地巨岩坠",
+  "pokemob.move.savage-spin-out--physical": "绝对捕食回旋斩",
+  "pokemob.move.savage-spin-out--special": "绝对捕食回旋斩",
+  "pokemob.move.never-ending-nightmare--physical": "无尽暗夜之诱惑",
+  "pokemob.move.never-ending-nightmare--special": "无尽暗夜之诱惑",
+  "pokemob.move.corkscrew-crash--physical": "超绝螺旋连击",
+  "pokemob.move.corkscrew-crash--special": "超绝螺旋连击",
+  "pokemob.move.inferno-overdrive--physical": "超强极限爆焰弹",
+  "pokemob.move.inferno-overdrive--special": "超强极限爆焰弹",
+  "pokemob.move.hydro-vortex--physical": "超级水流大漩涡",
+  "pokemob.move.hydro-vortex--special": "超级水流大漩涡",
+  "pokemob.move.bloom-doom--physical": "绚烂缤纷花怒放",
+  "pokemob.move.bloom-doom--special": "绚烂缤纷花怒放",
+  "pokemob.move.gigavolt-havoc--physical": "终极伏特狂雷闪",
+  "pokemob.move.gigavolt-havoc--special": "终极伏特狂雷闪",
+  "pokemob.move.shattered-psyche--physical": "至高精神破坏波",
+  "pokemob.move.shattered-psyche--special": "至高精神破坏波",
+  "pokemob.move.subzero-slammer--physical": "激狂大地万里冰",
+  "pokemob.move.subzero-slammer--special": "激狂大地万里冰",
+  "pokemob.move.devastating-drake--physical": "究极巨龙震天地",
+  "pokemob.move.devastating-drake--special": "究极巨龙震天地",
+  "pokemob.move.black-hole-eclipse--physical": "黑洞吞噬万物灭",
+  "pokemob.move.black-hole-eclipse--special": "黑洞吞噬万物灭",
+  "pokemob.move.twinkle-tackle--physical": "可爱星星飞天撞",
+  "pokemob.move.twinkle-tackle--special": "可爱星星飞天撞",
+  "pokemob.move.catastropika": "皮卡皮卡必杀击",
+  "pokemob.move.shore-up": "集沙",
+  "pokemob.move.first-impression": "迎头一击",
+  "pokemob.move.baneful-bunker": "碉堡",
+  "pokemob.move.spirit-shackle": "缝影",
+  "pokemob.move.darkest-lariat": "ＤＤ金勾臂",
+  "pokemob.move.sparkling-aria": "泡影的咏叹调",
+  "pokemob.move.ice-hammer": "冰锤",
+  "pokemob.move.floral-healing": "花疗",
+  "pokemob.move.high-horsepower": "十万马力",
+  "pokemob.move.strength-sap": "吸取力量",
+  "pokemob.move.solar-blade": "日光刃",
+  "pokemob.move.leafage": "树叶",
+  "pokemob.move.spotlight": "聚光灯",
+  "pokemob.move.toxic-thread": "毒丝",
+  "pokemob.move.laser-focus": "磨砺",
+  "pokemob.move.gear-up": "辅助齿轮",
+  "pokemob.move.throat-chop": "地狱突刺",
+  "pokemob.move.pollen-puff": "花粉团",
+  "pokemob.move.anchor-shot": "掷锚",
+  "pokemob.move.psychic-terrain": "精神场地",
+  "pokemob.move.lunge": "猛扑",
+  "pokemob.move.fire-lash": "火焰鞭",
+  "pokemob.move.power-trip": "嚣张",
+  "pokemob.move.burn-up": "燃尽",
+  "pokemob.move.speed-swap": "速度互换",
+  "pokemob.move.smart-strike": "修长之角",
+  "pokemob.move.purify": "净化",
+  "pokemob.move.revelation-dance": "觉醒之舞",
+  "pokemob.move.core-enforcer": "核心惩罚者",
+  "pokemob.move.trop-kick": "热带踢",
+  "pokemob.move.instruct": "号令",
+  "pokemob.move.beak-blast": "鸟嘴加农炮",
+  "pokemob.move.clanging-scales": "鳞片噪音",
+  "pokemob.move.dragon-hammer": "龙锤",
+  "pokemob.move.brutal-swing": "狂舞挥打",
+  "pokemob.move.aurora-veil": "极光幕",
+  "pokemob.move.sinister-arrow-raid": "遮天蔽日暗影箭",
+  "pokemob.move.malicious-moonsault": "极恶飞跃粉碎击",
+  "pokemob.move.oceanic-operetta": "海神庄严交响乐",
+  "pokemob.move.guardian-of-alola": "巨人卫士・阿罗拉",
+  "pokemob.move.soul-stealing-7-star-strike": "七星夺魂腿",
+  "pokemob.move.stoked-sparksurfer": "驾雷驭电戏冲浪",
+  "pokemob.move.pulverizing-pancake": "认真起来大爆击",
+  "pokemob.move.extreme-evoboost": "九彩升华齐聚顶",
+  "pokemob.move.genesis-supernova": "起源超新星大爆炸",
+  "pokemob.move.shell-trap": "陷阱甲壳",
+  "pokemob.move.fleur-cannon": "花朵加农炮",
+  "pokemob.move.psychic-fangs": "精神之牙",
+  "pokemob.move.stomping-tantrum": "跺脚",
+  "pokemob.move.shadow-bone": "暗影之骨",
+  "pokemob.move.accelerock": "冲岩",
+  "pokemob.move.liquidation": "水流裂破",
+  "pokemob.move.prismatic-laser": "棱镜镭射",
+  "pokemob.move.spectral-thief": "暗影偷盗",
+  "pokemob.move.sunsteel-strike": "流星闪冲",
+  "pokemob.move.moongeist-beam": "暗影之光",
+  "pokemob.move.tearful-look": "泪眼汪汪",
+  "pokemob.move.zing-zap": "麻麻刺刺",
+  "pokemob.move.natures-madness": "自然之怒",
+  "pokemob.move.multi-attack": "多属性攻击",
+  "pokemob.move.10-000-000-volt-thunderbolt": "千万伏特",
+  "pokemob.move.mind-blown": "惊爆大头",
+  "pokemob.move.plasma-fists": "等离子闪电拳",
+  "pokemob.move.photon-geyser": "光子喷涌",
+  "pokemob.move.light-that-burns-the-sky": "焚天灭世炽光爆",
+  "pokemob.move.searing-sunraze-smash": "日光回旋下苍穹",
+  "pokemob.move.menacing-moonraze-maelstrom": "月华飞溅落灵霄",
+  "pokemob.move.lets-snuggle-forever": "亲密无间大乱揍",
+  "pokemob.move.splintered-stormshards": "狼啸石牙飓风暴",
+  "pokemob.move.clangorous-soulblaze": "炽魂热舞烈音爆",
+  "pokemob.move.zippy-zap": "电电加速",
+  "pokemob.move.splishy-splash": "滔滔冲浪",
+  "pokemob.move.floaty-fall": "飘飘坠落",
+  "pokemob.move.pika-papow": "闪闪雷光",
+  "pokemob.move.bouncy-bubble": "活活气泡",
+  "pokemob.move.buzzy-buzz": "麻麻电击",
+  "pokemob.move.sizzly-slide": "熊熊火爆",
+  "pokemob.move.glitzy-glow": "哗哗气场",
+  "pokemob.move.baddy-bad": "坏坏领域",
+  "pokemob.move.sappy-seed": "茁茁轰炸",
+  "pokemob.move.freezy-frost": "冰冰霜冻",
+  "pokemob.move.sparkly-swirl": "亮亮风暴",
+  "pokemob.move.veevee-volley": "砰砰击破",
+  "pokemob.move.double-iron-bash": "钢拳双击",
+  "pokemob.move.max-guard": "极巨防壁",
+  "pokemob.move.dynamax-cannon": "极巨炮",
+  "pokemob.move.snipe-shot": "狙击",
+  "pokemob.move.jaw-lock": "紧咬不放",
+  "pokemob.move.stuff-cheeks": "大快朵颐",
+  "pokemob.move.no-retreat": "背水一战",
+  "pokemob.move.tar-shot": "沥青射击",
+  "pokemob.move.magic-powder": "魔法粉",
+  "pokemob.move.dragon-darts": "龙箭",
+  "pokemob.move.teatime": "茶会",
+  "pokemob.move.octolock": "蛸固",
+  "pokemob.move.bolt-beak": "电喙",
+  "pokemob.move.fishious-rend": "鳃咬",
+  "pokemob.move.court-change": "换场",
+  "pokemob.move.max-flare": "极巨火爆",
+  "pokemob.move.max-flutterby": "极巨虫蛊",
+  "pokemob.move.max-lightning": "极巨闪电",
+  "pokemob.move.max-strike": "极巨攻击",
+  "pokemob.move.max-knuckle": "极巨拳斗",
+  "pokemob.move.max-phantasm": "极巨幽魂",
+  "pokemob.move.max-hailstorm": "极巨寒冰",
+  "pokemob.move.max-ooze": "极巨酸毒",
+  "pokemob.move.max-geyser": "极巨水流",
+  "pokemob.move.max-airstream": "极巨飞冲",
+  "pokemob.move.max-starfall": "极巨妖精",
+  "pokemob.move.max-wyrmwind": "极巨龙骑",
+  "pokemob.move.max-mindstorm": "极巨超能",
+  "pokemob.move.max-rockfall": "极巨岩石",
+  "pokemob.move.max-quake": "极巨大地",
+  "pokemob.move.max-darkness": "极巨恶霸",
+  "pokemob.move.max-overgrowth": "极巨草原",
+  "pokemob.move.max-steelspike": "极巨钢铁",
+  "pokemob.move.clangorous-soul": "魂舞烈音爆",
+  "pokemob.move.body-press": "扑击",
+  "pokemob.move.decorate": "装饰",
+  "pokemob.move.drum-beating": "鼓击",
+  "pokemob.move.snap-trap": "捕兽夹",
+  "pokemob.move.pyro-ball": "火焰球",
+  "pokemob.move.behemoth-blade": "巨兽斩",
+  "pokemob.move.behemoth-bash": "巨兽弹",
+  "pokemob.move.aura-wheel": "气场轮",
+  "pokemob.move.breaking-swipe": "广域破坏",
+  "pokemob.move.branch-poke": "木枝突刺",
+  "pokemob.move.overdrive": "破音",
+  "pokemob.move.apple-acid": "苹果酸",
+  "pokemob.move.grav-apple": "万有引力",
+  "pokemob.move.spirit-break": "灵魂冲击",
+  "pokemob.move.strange-steam": "神奇蒸汽",
+  "pokemob.move.life-dew": "生命水滴",
+  "pokemob.move.obstruct": "拦堵",
+  "pokemob.move.false-surrender": "假跪真撞",
+  "pokemob.move.meteor-assault": "流星突击",
+  "pokemob.move.eternabeam": "无极光束",
+  "pokemob.move.steel-beam": "铁蹄光线",
+  "pokemob.move.expanding-force": "广域战力",
+  "pokemob.move.steel-roller": "铁滚轮",
+  "pokemob.move.scale-shot": "鳞射",
+  "pokemob.move.meteor-beam": "流星光束",
+  "pokemob.move.shell-side-arm": "臂贝武器",
+  "pokemob.move.misty-explosion": "薄雾炸裂",
+  "pokemob.move.grassy-glide": "青草滑梯",
+  "pokemob.move.rising-voltage": "电力上升",
+  "pokemob.move.terrain-pulse": "大地波动",
+  "pokemob.move.skitter-smack": "爬击",
+  "pokemob.move.burning-jealousy": "妒火",
+  "pokemob.move.lash-out": "泄愤",
+  "pokemob.move.poltergeist": "灵骚",
+  "pokemob.move.corrosive-gas": "腐蚀气体",
+  "pokemob.move.coaching": "指导",
+  "pokemob.move.flip-turn": "快速折返",
+  "pokemob.move.triple-axel": "三旋击",
+  "pokemob.move.dual-wingbeat": "双翼",
+  "pokemob.move.scorching-sands": "热沙大地",
+  "pokemob.move.jungle-healing": "丛林治疗",
+  "pokemob.move.wicked-blow": "暗冥强击",
+  "pokemob.move.surging-strikes": "水流连打",
+  "pokemob.move.thunder-cage": "雷电囚笼",
+  "pokemob.move.dragon-energy": "巨龙威能",
+  "pokemob.move.freezing-glare": "冰冷视线",
+  "pokemob.move.fiery-wrath": "怒火中烧",
+  "pokemob.move.thunderous-kick": "雷鸣蹴击",
+  "pokemob.move.glacial-lance": "雪矛",
+  "pokemob.move.astral-barrage": "星碎",
+  "pokemob.move.eerie-spell": "诡异咒语"
+}
\ No newline at end of file