diff --git a/pkNX.Structures.FlatBuffers/Arceus/ISlotTableConsumer.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/ISlotTableConsumer.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/ISlotTableConsumer.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/ISlotTableConsumer.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/LandmarkItemSpawnTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/LandmarkItemSpawnTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/LandmarkItemSpawnTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/LandmarkItemSpawnTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/LandmarkItemTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/LandmarkItemTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/LandmarkItemTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/LandmarkItemTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/MassOutbreakTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/MassOutbreakTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/MassOutbreakTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/MassOutbreakTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakGroup8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroup8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakGroup8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroupLottery8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakGroupLottery8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakGroupLottery8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakGroupLottery8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakLottery8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakLottery8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakLottery8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakLottery8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakTimeLimit8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakTimeLimit8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/NewHuge/NewHugeOutbreakTimeLimit8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/NewHuge/NewHugeOutbreakTimeLimit8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/OybnSettingTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/OybnSettingTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/OybnSettingTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/OybnSettingTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementItemArchive8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementItemArchive8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementItemArchive8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementItemArchive8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementLocation8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementLocation8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementLocation8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementLocation8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementLocationArchive8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementLocationArchive8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementLocationArchive8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementLocationArchive8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementMkrgTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementMkrgTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementMkrgTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementMkrgTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementParameters8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementParameters8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementParameters8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementParameters8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSearchItemTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSearchItemTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSearchItemTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSearchItemTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawner8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawner8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawner8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawner8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerData8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerData8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerData8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerData8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerF208a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerF208a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerF208a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerF208a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerF218a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerF218a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementSpawnerF218a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementSpawnerF218a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementUnnnTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementUnnnTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementUnnnTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementUnnnTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementV3f8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementV3f8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Placement/PlacementV3f8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Placement/PlacementV3f8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/AreaBGMTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaBGMTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/AreaBGMTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaBGMTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/AreaInstance8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaInstance8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/AreaInstance8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaInstance8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/AreaSettingsTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaSettingsTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/AreaSettingsTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaSettingsTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/AreaWeatherTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaWeatherTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/AreaWeatherTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/AreaWeatherTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/Editing/ResidentArea8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/Editing/ResidentArea8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/Editing/ResidentArea8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/Editing/ResidentArea8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Resident/Editing/ResidentInfo.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Resident/Editing/ResidentInfo.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Resident/Editing/ResidentInfo.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Resident/Editing/ResidentInfo.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterData8Archive.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterData8Archive.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterData8Archive.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterData8Archive.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterEligiblityTraits8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterEligiblityTraits8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterEligiblityTraits8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterEligiblityTraits8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterMultiplerArchive8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterMultiplerArchive8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterMultiplerArchive8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterMultiplerArchive8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterMultiplier8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterMultiplier8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterMultiplier8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterMultiplier8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterOybnTraits8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterOybnTraits8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterOybnTraits8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterOybnTraits8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterSlot8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterSlot8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterSlot8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterSlot8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/EncounterTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/EncounterTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/ISlotModifierTime.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/ISlotModifierTime.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/ISlotModifierTime.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/ISlotModifierTime.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Slots/ISlotModifierWeather.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Slots/ISlotModifierWeather.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Slots/ISlotModifierWeather.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Slots/ISlotModifierWeather.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Static/EventEncount8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncount8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Static/EventEncount8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncount8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Static/EventEncount8aArchive.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncount8aArchive.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Static/EventEncount8aArchive.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncount8aArchive.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Static/EventEncountPoke8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncountPoke8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Static/EventEncountPoke8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Field/Static/EventEncountPoke8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs b/pkNX.Structures.FlatBuffers/Arceus/Poke/EvolutionTable8.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/EvolutionTable8.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Poke/EvolutionTable8.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Learnset8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Poke/Learnset8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/Learnset8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Poke/Learnset8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PersonalInfoLAfb.cs b/pkNX.Structures.FlatBuffers/Arceus/Poke/PersonalInfoLAfb.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PersonalInfoLAfb.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Poke/PersonalInfoLAfb.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PokeResource/PokeInfoList.cs b/pkNX.Structures.FlatBuffers/Arceus/Poke/PokeResource/PokeInfoList.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PokeResource/PokeInfoList.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Poke/PokeResource/PokeInfoList.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PokeResource/PokeResourceTable8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Poke/PokeResource/PokeResourceTable8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PokeResource/PokeResourceTable8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Poke/PokeResource/PokeResourceTable8a.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PokedexDistributionTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexDistributionTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PokedexDistributionTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexDistributionTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PokedexRankTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexRankTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PokedexRankTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexRankTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/PokedexResearchTable.cs b/pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexResearchTable.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/PokedexResearchTable.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Pokedex/PokedexResearchTable.cs
diff --git a/pkNX.Structures.FlatBuffers/Arceus/Throw/ThrowableBaitParamDictionary8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Throw/ThrowableBaitParamDictionary8a.cs
new file mode 100644
index 00000000..b1b98d66
--- /dev/null
+++ b/pkNX.Structures.FlatBuffers/Arceus/Throw/ThrowableBaitParamDictionary8a.cs
@@ -0,0 +1,33 @@
+using System;
+using System.ComponentModel;
+using FlatSharp.Attributes;
+
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable ClassNeverInstantiated.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedType.Global
+// ReSharper disable UnusedMember.Global
+// ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
+
+namespace pkNX.Structures.FlatBuffers;
+
+[FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))]
+public class ThrowableBaitParamDictionary8a : IFlatBufferArchive<ThrowableBaitParamEntry8a>
+{
+    public byte[] Write() => FlatBufferConverter.SerializeFrom(this);
+
+    [FlatBufferItem(0)] public ThrowableBaitParamEntry8a[] Table { get; set; } = Array.Empty<ThrowableBaitParamEntry8a>();
+}
+
+[FlatBufferTable, TypeConverter(typeof(ExpandableObjectConverter))]
+public class ThrowableBaitParamEntry8a
+{
+    [FlatBufferItem(00)] public ulong Hash_00 { get; set; }
+    [FlatBufferItem(01)] public string Field_01 { get; set; } = string.Empty;
+    [FlatBufferItem(02)] public string Field_02 { get; set; } = string.Empty;
+    [FlatBufferItem(03)] public string Field_03 { get; set; } = string.Empty;
+    [FlatBufferItem(04)] public int Unused { get; set; }
+    [FlatBufferItem(05)] public int Field_05 { get; set; }
+    [FlatBufferItem(06)] public int Field_06 { get; set; }
+    [FlatBufferItem(07)] public string Field_07 { get; set; } = string.Empty;
+}
diff --git a/pkNX.Structures.FlatBuffers/Arceus/ArchiveContents8a.cs b/pkNX.Structures.FlatBuffers/Arceus/Util/ArchiveContents8a.cs
similarity index 100%
rename from pkNX.Structures.FlatBuffers/Arceus/ArchiveContents8a.cs
rename to pkNX.Structures.FlatBuffers/Arceus/Util/ArchiveContents8a.cs