diff --git a/Data/Scripts/011_Battle/005_AI/003_AI_Switch.rb b/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/003_AI_Switch.rb
rename to Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
diff --git a/Data/Scripts/011_Battle/005_AI/002_AI_Item.rb b/Data/Scripts/011_Battle/005_AI/003_AI_Item.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/002_AI_Item.rb
rename to Data/Scripts/011_Battle/005_AI/003_AI_Item.rb
diff --git a/Data/Scripts/011_Battle/005_AI/005_AI_MegaEvolve.rb b/Data/Scripts/011_Battle/005_AI/004_AI_MegaEvolve.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/005_AI_MegaEvolve.rb
rename to Data/Scripts/011_Battle/005_AI/004_AI_MegaEvolve.rb
diff --git a/Data/Scripts/011_Battle/005_AI/004_AI_ChooseMove.rb b/Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/004_AI_ChooseMove.rb
rename to Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
diff --git a/Data/Scripts/011_Battle/005_AI/020_AI_Move_EffectScoresGeneric.rb b/Data/Scripts/011_Battle/005_AI/006_AI_ChooseMove_GenericEffects.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/020_AI_Move_EffectScoresGeneric.rb
rename to Data/Scripts/011_Battle/005_AI/006_AI_ChooseMove_GenericEffects.rb
diff --git a/Data/Scripts/011_Battle/005_AI/070_AI_MoveHandlers_GeneralModifiers.rb b/Data/Scripts/011_Battle/005_AI/007_AI_ChooseMove_OtherScores.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/070_AI_MoveHandlers_GeneralModifiers.rb
rename to Data/Scripts/011_Battle/005_AI/007_AI_ChooseMove_OtherScores.rb
diff --git a/Data/Scripts/011_Battle/005_AI/008_AI_Move_Utilities.rb b/Data/Scripts/011_Battle/005_AI/008_AI_Utilities.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/008_AI_Move_Utilities.rb
rename to Data/Scripts/011_Battle/005_AI/008_AI_Utilities.rb
diff --git a/Data/Scripts/011_Battle/005_AI/101_AITrainer.rb b/Data/Scripts/011_Battle/005_AI/010_AITrainer.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/101_AITrainer.rb
rename to Data/Scripts/011_Battle/005_AI/010_AITrainer.rb
diff --git a/Data/Scripts/011_Battle/005_AI/102_AIBattler.rb b/Data/Scripts/011_Battle/005_AI/011_AIBattler.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/102_AIBattler.rb
rename to Data/Scripts/011_Battle/005_AI/011_AIBattler.rb
diff --git a/Data/Scripts/011_Battle/005_AI/103_AIMove.rb b/Data/Scripts/011_Battle/005_AI/012_AIMove.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005_AI/103_AIMove.rb
rename to Data/Scripts/011_Battle/005_AI/012_AIMove.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/051_AI_MoveHandlers_Misc.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/001_AI_MoveEffects_Misc.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/051_AI_MoveHandlers_Misc.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/001_AI_MoveEffects_Misc.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/052_AI_MoveHandlers_BattlerStats.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/002_AI_MoveEffects_BattlerStats.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/052_AI_MoveHandlers_BattlerStats.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/002_AI_MoveEffects_BattlerStats.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/053_AI_MoveHandlers_BattlerOther.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/003_AI_MoveEffects_BattlerOther.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/053_AI_MoveHandlers_BattlerOther.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/003_AI_MoveEffects_BattlerOther.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/054_AI_MoveHandlers_MoveAttributes.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/054_AI_MoveHandlers_MoveAttributes.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/055_AI_MoveHandlers_MultiHit.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/005_AI_MoveEffects_MultiHit.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/055_AI_MoveHandlers_MultiHit.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/005_AI_MoveEffects_MultiHit.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/056_AI_MoveHandlers_Healing.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/006_AI_MoveEffects_Healing.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/056_AI_MoveHandlers_Healing.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/006_AI_MoveEffects_Healing.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/057_AI_MoveHandlers_Items.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/007_AI_MoveEffects_Items.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/057_AI_MoveHandlers_Items.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/007_AI_MoveEffects_Items.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/058_AI_MoveHandlers_ChangeMoveEffect.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/008_AI_MoveEffects_ChangeMoveEffect.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/058_AI_MoveHandlers_ChangeMoveEffect.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/008_AI_MoveEffects_ChangeMoveEffect.rb
diff --git a/Data/Scripts/011_Battle/005b_AI move function codes/059_AI_MoveHandlers_SwitchingActing.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/009_AI_MoveEffects_SwitchingActing.rb
similarity index 100%
rename from Data/Scripts/011_Battle/005b_AI move function codes/059_AI_MoveHandlers_SwitchingActing.rb
rename to Data/Scripts/011_Battle/006_AI MoveEffects/009_AI_MoveEffects_SwitchingActing.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/001_PBEffects.rb b/Data/Scripts/011_Battle/007_Other battle code/001_PBEffects.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/001_PBEffects.rb
rename to Data/Scripts/011_Battle/007_Other battle code/001_PBEffects.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/002_Battle_ActiveField.rb b/Data/Scripts/011_Battle/007_Other battle code/002_Battle_ActiveField.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/002_Battle_ActiveField.rb
rename to Data/Scripts/011_Battle/007_Other battle code/002_Battle_ActiveField.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/003_Battle_DamageState.rb b/Data/Scripts/011_Battle/007_Other battle code/003_Battle_DamageState.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/003_Battle_DamageState.rb
rename to Data/Scripts/011_Battle/007_Other battle code/003_Battle_DamageState.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/004_Battle_Peers.rb b/Data/Scripts/011_Battle/007_Other battle code/004_Battle_Peers.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/004_Battle_Peers.rb
rename to Data/Scripts/011_Battle/007_Other battle code/004_Battle_Peers.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/005_Battle_CatchAndStoreMixin.rb b/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/005_Battle_CatchAndStoreMixin.rb
rename to Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/006_Battle_Clauses.rb b/Data/Scripts/011_Battle/007_Other battle code/006_Battle_Clauses.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/006_Battle_Clauses.rb
rename to Data/Scripts/011_Battle/007_Other battle code/006_Battle_Clauses.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/007_BattleAnimationPlayer.rb b/Data/Scripts/011_Battle/007_Other battle code/007_BattleAnimationPlayer.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/007_BattleAnimationPlayer.rb
rename to Data/Scripts/011_Battle/007_Other battle code/007_BattleAnimationPlayer.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb b/Data/Scripts/011_Battle/007_Other battle code/008_Battle_AbilityEffects.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb
rename to Data/Scripts/011_Battle/007_Other battle code/008_Battle_AbilityEffects.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb b/Data/Scripts/011_Battle/007_Other battle code/009_Battle_ItemEffects.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb
rename to Data/Scripts/011_Battle/007_Other battle code/009_Battle_ItemEffects.rb
diff --git a/Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb b/Data/Scripts/011_Battle/007_Other battle code/010_Battle_PokeBallEffects.rb
similarity index 100%
rename from Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb
rename to Data/Scripts/011_Battle/007_Other battle code/010_Battle_PokeBallEffects.rb
diff --git a/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb b/Data/Scripts/011_Battle/008_Other battle types/001_SafariBattle.rb
similarity index 100%
rename from Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb
rename to Data/Scripts/011_Battle/008_Other battle types/001_SafariBattle.rb
diff --git a/Data/Scripts/011_Battle/007_Other battle types/002_BugContestBattle.rb b/Data/Scripts/011_Battle/008_Other battle types/002_BugContestBattle.rb
similarity index 100%
rename from Data/Scripts/011_Battle/007_Other battle types/002_BugContestBattle.rb
rename to Data/Scripts/011_Battle/008_Other battle types/002_BugContestBattle.rb
diff --git a/Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb b/Data/Scripts/011_Battle/008_Other battle types/003_BattlePalaceBattle.rb
similarity index 100%
rename from Data/Scripts/011_Battle/007_Other battle types/003_BattlePalaceBattle.rb
rename to Data/Scripts/011_Battle/008_Other battle types/003_BattlePalaceBattle.rb
diff --git a/Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb b/Data/Scripts/011_Battle/008_Other battle types/004_BattleArenaBattle.rb
similarity index 100%
rename from Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb
rename to Data/Scripts/011_Battle/008_Other battle types/004_BattleArenaBattle.rb
diff --git a/Data/Scripts/011_Battle/007_Other battle types/005_RecordedBattle.rb b/Data/Scripts/011_Battle/008_Other battle types/005_RecordedBattle.rb
similarity index 100%
rename from Data/Scripts/011_Battle/007_Other battle types/005_RecordedBattle.rb
rename to Data/Scripts/011_Battle/008_Other battle types/005_RecordedBattle.rb