diff --git a/Classic/Deadmines/Cookie.lua b/Cataclysm/Deadmines/Cookie.lua
similarity index 100%
rename from Classic/Deadmines/Cookie.lua
rename to Cataclysm/Deadmines/Cookie.lua
diff --git a/Classic/Deadmines/FoeReaper5000.lua b/Cataclysm/Deadmines/FoeReaper5000.lua
similarity index 100%
rename from Classic/Deadmines/FoeReaper5000.lua
rename to Cataclysm/Deadmines/FoeReaper5000.lua
diff --git a/Classic/Deadmines/Glubtok.lua b/Cataclysm/Deadmines/Glubtok.lua
similarity index 100%
rename from Classic/Deadmines/Glubtok.lua
rename to Cataclysm/Deadmines/Glubtok.lua
diff --git a/Classic/Deadmines/HelixGearbreaker.lua b/Cataclysm/Deadmines/HelixGearbreaker.lua
similarity index 100%
rename from Classic/Deadmines/HelixGearbreaker.lua
rename to Cataclysm/Deadmines/HelixGearbreaker.lua
diff --git a/Classic/Deadmines/Options/Colors.lua b/Cataclysm/Deadmines/Options/Colors.lua
similarity index 100%
rename from Classic/Deadmines/Options/Colors.lua
rename to Cataclysm/Deadmines/Options/Colors.lua
diff --git a/Classic/Deadmines/Options/Sounds.lua b/Cataclysm/Deadmines/Options/Sounds.lua
similarity index 100%
rename from Classic/Deadmines/Options/Sounds.lua
rename to Cataclysm/Deadmines/Options/Sounds.lua
diff --git a/Classic/Deadmines/Options/options.xml b/Cataclysm/Deadmines/Options/options.xml
similarity index 100%
rename from Classic/Deadmines/Options/options.xml
rename to Cataclysm/Deadmines/Options/options.xml
diff --git a/Classic/Deadmines/VanessaVanCleef.lua b/Cataclysm/Deadmines/VanessaVanCleef.lua
similarity index 100%
rename from Classic/Deadmines/VanessaVanCleef.lua
rename to Cataclysm/Deadmines/VanessaVanCleef.lua
diff --git a/Classic/Deadmines/modules.xml b/Cataclysm/Deadmines/modules.xml
similarity index 100%
rename from Classic/Deadmines/modules.xml
rename to Cataclysm/Deadmines/modules.xml
diff --git a/Cataclysm/LittleWigs_Cataclysm_Cata.toc b/Cataclysm/LittleWigs_Cataclysm_Cata.toc
index f5d0fc0c1..022f966e8 100644
--- a/Cataclysm/LittleWigs_Cataclysm_Cata.toc
+++ b/Cataclysm/LittleWigs_Cataclysm_Cata.toc
@@ -17,6 +17,6 @@
## Dependencies: BigWigs
## X-Category: Party
-## X-BigWigs-LoadOn-InstanceId: 568, 643, 644, 645, 657, 670, 725, 755, 859, 938, 939, 940
+## X-BigWigs-LoadOn-InstanceId: 33, 36, 568, 643, 644, 645, 657, 670, 725, 755, 859, 938, 939, 940
modules.xml
diff --git a/Cataclysm/LittleWigs_Cataclysm_Mainline.toc b/Cataclysm/LittleWigs_Cataclysm_Mainline.toc
index 1a6d4766e..3ccfdaee7 100644
--- a/Cataclysm/LittleWigs_Cataclysm_Mainline.toc
+++ b/Cataclysm/LittleWigs_Cataclysm_Mainline.toc
@@ -17,6 +17,6 @@
## Dependencies: BigWigs
## X-Category: Party
-## X-BigWigs-LoadOn-InstanceId: 568, 643, 644, 645, 657, 670, 725, 755, 859, 938, 939, 940
+## X-BigWigs-LoadOn-InstanceId: 33, 36, 568, 643, 644, 645, 657, 670, 725, 755, 859, 938, 939, 940
modules.xml
diff --git a/Classic/ShadowfangKeep/Ashbury.lua b/Cataclysm/ShadowfangKeep/Ashbury.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Ashbury.lua
rename to Cataclysm/ShadowfangKeep/Ashbury.lua
diff --git a/Classic/ShadowfangKeep/Godfrey.lua b/Cataclysm/ShadowfangKeep/Godfrey.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Godfrey.lua
rename to Cataclysm/ShadowfangKeep/Godfrey.lua
diff --git a/Classic/ShadowfangKeep/Locales/deDE.lua b/Cataclysm/ShadowfangKeep/Locales/deDE.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/deDE.lua
rename to Cataclysm/ShadowfangKeep/Locales/deDE.lua
diff --git a/Classic/ShadowfangKeep/Locales/esES.lua b/Cataclysm/ShadowfangKeep/Locales/esES.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/esES.lua
rename to Cataclysm/ShadowfangKeep/Locales/esES.lua
diff --git a/Classic/ShadowfangKeep/Locales/frFR.lua b/Cataclysm/ShadowfangKeep/Locales/frFR.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/frFR.lua
rename to Cataclysm/ShadowfangKeep/Locales/frFR.lua
diff --git a/Classic/ShadowfangKeep/Locales/itIT.lua b/Cataclysm/ShadowfangKeep/Locales/itIT.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/itIT.lua
rename to Cataclysm/ShadowfangKeep/Locales/itIT.lua
diff --git a/Classic/ShadowfangKeep/Locales/koKR.lua b/Cataclysm/ShadowfangKeep/Locales/koKR.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/koKR.lua
rename to Cataclysm/ShadowfangKeep/Locales/koKR.lua
diff --git a/Classic/ShadowfangKeep/Locales/locales.xml b/Cataclysm/ShadowfangKeep/Locales/locales.xml
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/locales.xml
rename to Cataclysm/ShadowfangKeep/Locales/locales.xml
diff --git a/Classic/ShadowfangKeep/Locales/ptBR.lua b/Cataclysm/ShadowfangKeep/Locales/ptBR.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/ptBR.lua
rename to Cataclysm/ShadowfangKeep/Locales/ptBR.lua
diff --git a/Classic/ShadowfangKeep/Locales/ruRU.lua b/Cataclysm/ShadowfangKeep/Locales/ruRU.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/ruRU.lua
rename to Cataclysm/ShadowfangKeep/Locales/ruRU.lua
diff --git a/Classic/ShadowfangKeep/Locales/zhCN.lua b/Cataclysm/ShadowfangKeep/Locales/zhCN.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/zhCN.lua
rename to Cataclysm/ShadowfangKeep/Locales/zhCN.lua
diff --git a/Classic/ShadowfangKeep/Locales/zhTW.lua b/Cataclysm/ShadowfangKeep/Locales/zhTW.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Locales/zhTW.lua
rename to Cataclysm/ShadowfangKeep/Locales/zhTW.lua
diff --git a/Classic/ShadowfangKeep/Options/Colors.lua b/Cataclysm/ShadowfangKeep/Options/Colors.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Options/Colors.lua
rename to Cataclysm/ShadowfangKeep/Options/Colors.lua
diff --git a/Classic/ShadowfangKeep/Options/Sounds.lua b/Cataclysm/ShadowfangKeep/Options/Sounds.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Options/Sounds.lua
rename to Cataclysm/ShadowfangKeep/Options/Sounds.lua
diff --git a/Classic/ShadowfangKeep/Options/options.xml b/Cataclysm/ShadowfangKeep/Options/options.xml
similarity index 100%
rename from Classic/ShadowfangKeep/Options/options.xml
rename to Cataclysm/ShadowfangKeep/Options/options.xml
diff --git a/Classic/ShadowfangKeep/Silverlaine.lua b/Cataclysm/ShadowfangKeep/Silverlaine.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Silverlaine.lua
rename to Cataclysm/ShadowfangKeep/Silverlaine.lua
diff --git a/Classic/ShadowfangKeep/Springvale.lua b/Cataclysm/ShadowfangKeep/Springvale.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Springvale.lua
rename to Cataclysm/ShadowfangKeep/Springvale.lua
diff --git a/Classic/ShadowfangKeep/Walden.lua b/Cataclysm/ShadowfangKeep/Walden.lua
similarity index 100%
rename from Classic/ShadowfangKeep/Walden.lua
rename to Cataclysm/ShadowfangKeep/Walden.lua
diff --git a/Classic/ShadowfangKeep/modules.xml b/Cataclysm/ShadowfangKeep/modules.xml
similarity index 100%
rename from Classic/ShadowfangKeep/modules.xml
rename to Cataclysm/ShadowfangKeep/modules.xml
diff --git a/Cataclysm/modules.xml b/Cataclysm/modules.xml
index 68ecfdefc..822df557b 100644
--- a/Cataclysm/modules.xml
+++ b/Cataclysm/modules.xml
@@ -2,11 +2,13 @@
..\FrameXML\UI.xsd">
+
+
diff --git a/Classic/LittleWigs_Classic_Cata.toc b/Classic/LittleWigs_Classic_Cata.toc
index bb88835a1..d745c668d 100644
--- a/Classic/LittleWigs_Classic_Cata.toc
+++ b/Classic/LittleWigs_Classic_Cata.toc
@@ -17,6 +17,5 @@
## Dependencies: BigWigs
## X-Category: Party
-# X-BigWigs-LoadOn-InstanceId: 33, 36
-#modules.xml
+modules.xml
diff --git a/Classic/LittleWigs_Classic_Mainline.toc b/Classic/LittleWigs_Classic_Mainline.toc
index 9554fb4e4..226f24d2b 100644
--- a/Classic/LittleWigs_Classic_Mainline.toc
+++ b/Classic/LittleWigs_Classic_Mainline.toc
@@ -17,6 +17,5 @@
## Dependencies: BigWigs
## X-Category: Party
-## X-BigWigs-LoadOn-InstanceId: 33, 36
modules.xml
diff --git a/Classic/LittleWigs_Classic_TBC.toc b/Classic/LittleWigs_Classic_TBC.toc
index 617a68a48..5a8936b11 100644
--- a/Classic/LittleWigs_Classic_TBC.toc
+++ b/Classic/LittleWigs_Classic_TBC.toc
@@ -17,6 +17,5 @@
## Dependencies: BigWigs
## X-Category: Party
-# X-BigWigs-LoadOn-InstanceId: 33, 36
-#modules.xml
+modules.xml
diff --git a/Classic/LittleWigs_Classic_Vanilla.toc b/Classic/LittleWigs_Classic_Vanilla.toc
index c0d7edf73..6d8dde7e5 100644
--- a/Classic/LittleWigs_Classic_Vanilla.toc
+++ b/Classic/LittleWigs_Classic_Vanilla.toc
@@ -17,6 +17,5 @@
## Dependencies: BigWigs
## X-Category: Party
-# X-BigWigs-LoadOn-InstanceId: 33, 36
-#modules.xml
+modules.xml
diff --git a/Classic/LittleWigs_Classic_Wrath.toc b/Classic/LittleWigs_Classic_Wrath.toc
index 874d49d9d..4be207ccb 100644
--- a/Classic/LittleWigs_Classic_Wrath.toc
+++ b/Classic/LittleWigs_Classic_Wrath.toc
@@ -17,6 +17,5 @@
## Dependencies: BigWigs
## X-Category: Party
-# X-BigWigs-LoadOn-InstanceId: 33, 36
-#modules.xml
+modules.xml
diff --git a/Classic/modules.xml b/Classic/modules.xml
index 4f6f60602..8b855cda6 100644
--- a/Classic/modules.xml
+++ b/Classic/modules.xml
@@ -1,7 +1,4 @@
-
-
-
diff --git a/LittleWigs.toc b/LittleWigs.toc
index ba11f053c..de1d6d5c7 100644
--- a/LittleWigs.toc
+++ b/LittleWigs.toc
@@ -26,7 +26,7 @@
## X-LittleWigs-Repo: 1
## X-BigWigs-ExtraMenu: 1716
## X-BigWigs-NoMenu: 1616, 1673, 1684, 1698, 1702, 1703, 1710
-## X-BigWigs-LoadOn-InstanceId: 33,36, 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585, 536,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668, 568,643,644,645,657,670,725,755,859,938,939,940, 959,960,961,962,994,1001,1004,1007,1011,1112, 1175,1176,1182,1195,1208,1209,1279,1358, 1456,1466,1477,1458,1492,1493,1501,1516,1544,1571,1616,1651,1673,1677,1684,1698,1702,1703,1710,1753, 1594,1754,1762,1763,1771,1822,1841,1862,1864,1877,2097,2212,2213, 2284,2285,2286,2287,2289,2290,2291,2293,2441, 2520,2527,2519,2521,2526,2515,2516,2451,2579, 2648,2649,2651,2652,2660,2661,2662,2669
+## X-BigWigs-LoadOn-InstanceId: 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585, 536,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668, 33,36,568,643,644,645,657,670,725,755,859,938,939,940, 959,960,961,962,994,1001,1004,1007,1011,1112, 1175,1176,1182,1195,1208,1209,1279,1358, 1456,1466,1477,1458,1492,1493,1501,1516,1544,1571,1616,1651,1673,1677,1684,1698,1702,1703,1710,1753, 1594,1754,1762,1763,1771,1822,1841,1862,1864,1877,2097,2212,2213, 2284,2285,2286,2287,2289,2290,2291,2293,2441, 2520,2527,2519,2521,2526,2515,2516,2451,2579, 2648,2649,2651,2652,2660,2661,2662,2669
#@end-do-not-package@
## Dependencies: BigWigs
## LoadOnDemand: 1
diff --git a/LittleWigs_Cata.toc b/LittleWigs_Cata.toc
index 71fc0cd42..c2dc97dcd 100644
--- a/LittleWigs_Cata.toc
+++ b/LittleWigs_Cata.toc
@@ -27,7 +27,8 @@
#@do-not-package@
## X-LittleWigs-Repo: 1
-## X-BigWigs-LoadOn-InstanceId: 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585, 536,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668, 568,643,644,645,657,670,725,755,859,938,939,940
+## X-BigWigs-LoadOn-InstanceId: 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585, 536,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668, 33,36,568,643,644,645,657,670,725,755,859,938,939,940
+Classic\modules.xml
TBC\modules.xml
WotLK\modules.xml
Cataclysm\modules.xml
diff --git a/LittleWigs_TBC.toc b/LittleWigs_TBC.toc
index 3b4df212e..b65528aad 100644
--- a/LittleWigs_TBC.toc
+++ b/LittleWigs_TBC.toc
@@ -28,5 +28,6 @@
#@do-not-package@
## X-LittleWigs-Repo: 1
## X-BigWigs-LoadOn-InstanceId: 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585
+Classic\modules.xml
TBC\modules.xml
#@end-do-not-package@
diff --git a/LittleWigs_Vanilla.toc b/LittleWigs_Vanilla.toc
index 6d75581d9..4ce5ea8e7 100644
--- a/LittleWigs_Vanilla.toc
+++ b/LittleWigs_Vanilla.toc
@@ -27,4 +27,5 @@
#@do-not-package@
## X-LittleWigs-Repo: 1
+Classic\modules.xml
#@end-do-not-package@
diff --git a/LittleWigs_Wrath.toc b/LittleWigs_Wrath.toc
index e0c7a2b71..c7f566a4b 100644
--- a/LittleWigs_Wrath.toc
+++ b/LittleWigs_Wrath.toc
@@ -28,6 +28,7 @@
#@do-not-package@
## X-LittleWigs-Repo: 1
## X-BigWigs-LoadOn-InstanceId: 269,540,542,543,545,546,547,552,553,554,555,556,557,558,560,585, 536,574,575,576,578,595,599,600,601,602,604,608,619,632,650,658,668
+Classic\modules.xml
TBC\modules.xml
WotLK\modules.xml
#@end-do-not-package@