diff --git a/Libs/libs.xml b/Libs/libs.xml
new file mode 100644
index 0000000..61bf42e
--- /dev/null
+++ b/Libs/libs.xml
@@ -0,0 +1,24 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+  
+  <Script file="LibStub\LibStub.lua"/>
+  <Include file="CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
+  
+  <Include file="AceAddon-3.0\AceAddon-3.0.xml"/>
+  <Include file="AceComm-3.0\AceComm-3.0.xml"/>
+  
+  <Script file="UTF8\utf8data.lua"/>
+  <Script file="UTF8\utf8.lua"/>
+  
+  <Include file="LibCustomGlow-1.0\LibCustomGlow-1.0.xml"/>
+  
+  <Script file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
+  
+  <Include file="LibDBIcon-1.0\lib.xml"/>
+  
+  <Include file="LibDeflate\lib.xml"/>
+  
+  <Script file="LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
+  
+  <Include file="ItemCache\ItemCache.xml"/>
+  
+</Ui>
\ No newline at end of file
diff --git a/LootReserve.toc b/LootReserve.toc
index efb0d68..4372983 100644
--- a/LootReserve.toc
+++ b/LootReserve.toc
@@ -1,32 +1,22 @@
 ## Interface: 30400
-## Title: LootReserve
-## Notes: Soft reserves management addon
-## Author: Damagus-Benediction|nOriginal addon by Tagar-NethergardeKeep
+## Interface-Wrath: 30400
+## Interface-Classic: 11403
 
 ## Version: 2022-10-10-2
 ## X-Min-Allowed-Version: 2022-10-10-2
 
-## OptionalDeps: ItemCache
+## X-Curse-Project-ID: 390790
+## X-Wago-ID: WL6JpyGv
+
+## Title: LootReserve
+## Notes: Soft reserves management addon
+## Author: Anonomit, Damagus-Benediction|nOriginal addon by Tagar-NethergardeKeep
 
 ## SavedVariables: LootReserveGlobalSave
 ## SavedVariablesPerCharacter: LootReserveCharacterSave
 
-embeds.xml
+## OptionalDeps: Ace3, ItemCache
+## X-Embeds: Ace3, ItemCache
 
-LootReserve.lua
-Constants.lua
-ItemSearch.lua
-Client.lua
-Server.lua
-Comm.lua
-Data.lua
-ItemConditions.lua
 
-Windows/Common.xml
-Windows/ClientWindow.xml
-Windows/ServerWindow.xml
-Windows/RollRequestWindow.xml
-Windows/ServerLootEditWindow.xml
-Windows/ServerMembersEditWindow.xml
-Windows/ServerImportWindow.xml
-Windows/ServerExportWindow.xml
+addon.xml
diff --git a/LootReserve_Vanilla.toc b/LootReserve_Vanilla.toc
deleted file mode 100644
index 557b6d4..0000000
--- a/LootReserve_Vanilla.toc
+++ /dev/null
@@ -1,32 +0,0 @@
-## Interface: 11403
-## Title: LootReserve
-## Notes: Soft reserves management addon
-## Author: Damagus-Benediction|nOriginal addon by Tagar-NethergardeKeep
-
-## Version: 2022-10-10-2
-## X-Min-Allowed-Version: 2022-10-10-2
-
-## OptionalDeps: ItemCache
-
-## SavedVariables: LootReserveGlobalSave
-## SavedVariablesPerCharacter: LootReserveCharacterSave
-
-embeds.xml
-
-LootReserve.lua
-Constants.lua
-ItemSearch.lua
-Client.lua
-Server.lua
-Comm.lua
-Data.lua
-ItemConditions.lua
-
-Windows/Common.xml
-Windows/ClientWindow.xml
-Windows/ServerWindow.xml
-Windows/RollRequestWindow.xml
-Windows/ServerLootEditWindow.xml
-Windows/ServerMembersEditWindow.xml
-Windows/ServerImportWindow.xml
-Windows/ServerExportWindow.xml
diff --git a/LootReserve_Wrath.toc b/LootReserve_Wrath.toc
deleted file mode 100644
index efb0d68..0000000
--- a/LootReserve_Wrath.toc
+++ /dev/null
@@ -1,32 +0,0 @@
-## Interface: 30400
-## Title: LootReserve
-## Notes: Soft reserves management addon
-## Author: Damagus-Benediction|nOriginal addon by Tagar-NethergardeKeep
-
-## Version: 2022-10-10-2
-## X-Min-Allowed-Version: 2022-10-10-2
-
-## OptionalDeps: ItemCache
-
-## SavedVariables: LootReserveGlobalSave
-## SavedVariablesPerCharacter: LootReserveCharacterSave
-
-embeds.xml
-
-LootReserve.lua
-Constants.lua
-ItemSearch.lua
-Client.lua
-Server.lua
-Comm.lua
-Data.lua
-ItemConditions.lua
-
-Windows/Common.xml
-Windows/ClientWindow.xml
-Windows/ServerWindow.xml
-Windows/RollRequestWindow.xml
-Windows/ServerLootEditWindow.xml
-Windows/ServerMembersEditWindow.xml
-Windows/ServerImportWindow.xml
-Windows/ServerExportWindow.xml
diff --git a/Windows/ClientWindow.xml b/Windows/ClientWindow.xml
index 6f617b6..8094db4 100644
--- a/Windows/ClientWindow.xml
+++ b/Windows/ClientWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file="Windows/ClientWindow.lua" />
+	<Script file="ClientWindow.lua" />
 	<CheckButton name="LootReserveCategoryListButtonTemplate" virtual="true">
 		<Size y="18" />
 		<Layers>
diff --git a/Windows/RollRequestWindow.xml b/Windows/RollRequestWindow.xml
index a10a5d6..65d6e9f 100644
--- a/Windows/RollRequestWindow.xml
+++ b/Windows/RollRequestWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<Script file="Windows/RollRequestWindow.lua" />
+	<Script file="RollRequestWindow.lua" />
 	<Frame name="LootReserveRollRequestWindow" parent="UIParent" toplevel="true" movable="true" resizable="true" enableMouse="true" clampedToScreen="true" hidden="true" inherits="LootReserveBackdropTemplate">
 		<KeyValues>
 			<KeyValue key="backdropInfo" value="LOOTRESERVE_BACKDROP_BLACK_4" type="global" />
diff --git a/Windows/ServerExportWindow.xml b/Windows/ServerExportWindow.xml
index dc618be..dcef199 100644
--- a/Windows/ServerExportWindow.xml
+++ b/Windows/ServerExportWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<Script file="Windows/ServerExportWindow.lua" />
+	<Script file="ServerExportWindow.lua" />
 	<Frame name="LootReserveServerExportWindow" parent="UIParent" inherits="BasicFrameTemplateWithInset" toplevel="true" movable="true" resizable="true" enableMouse="true" clampedToScreen="true" hidden="true">
 		<Size x="300" y="150" />
 		<Anchors>
diff --git a/Windows/ServerImportWindow.xml b/Windows/ServerImportWindow.xml
index 5565f74..059dac3 100644
--- a/Windows/ServerImportWindow.xml
+++ b/Windows/ServerImportWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<Script file="Windows/ServerImportWindow.lua" />
+	<Script file="ServerImportWindow.lua" />
 	<Frame name="LootReserveServerImportItemTemplate" virtual="true">
 		<Size x="18" y="18" />
 		<Frames>
diff --git a/Windows/ServerLootEditWindow.xml b/Windows/ServerLootEditWindow.xml
index df83701..8d27571 100644
--- a/Windows/ServerLootEditWindow.xml
+++ b/Windows/ServerLootEditWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file="Windows/ServerLootEditWindow.lua" />
+	<Script file="ServerLootEditWindow.lua" />
 	<Frame name="LootReserveLootEditListTemplate" virtual="true" enableMouse="true" inherits="LootReserveBackdropTemplate">
 		<KeyValues>
 			<KeyValue key="backdropInfo" value="BACKDROP_TOOLTIP_0_16_5555" type="global" />
diff --git a/Windows/ServerMembersEditWindow.xml b/Windows/ServerMembersEditWindow.xml
index db8554d..b18fbc9 100644
--- a/Windows/ServerMembersEditWindow.xml
+++ b/Windows/ServerMembersEditWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<Script file="Windows/ServerMembersEditWindow.lua" />
+	<Script file="ServerMembersEditWindow.lua" />
 	<Frame name="LootReserveServerMembersEditItemTemplate" virtual="true">
 		<Size x="18" y="18" />
 		<Frames>
diff --git a/Windows/ServerWindow.xml b/Windows/ServerWindow.xml
index f73b4b7..a6c86f2 100644
--- a/Windows/ServerWindow.xml
+++ b/Windows/ServerWindow.xml
@@ -1,5 +1,5 @@
 <Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file="Windows/ServerWindow.lua" />
+	<Script file="ServerWindow.lua" />
 	<Button name="LootReserveServerWindowTabTemplate" parentArray="Tabs" virtual="true">
 		<Size>
 			<AbsDimension x="10" y="32" />
diff --git a/Windows/windows.xml b/Windows/windows.xml
new file mode 100644
index 0000000..851a709
--- /dev/null
+++ b/Windows/windows.xml
@@ -0,0 +1,12 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+  
+  <Include file="Common.xml"/>
+  <Include file="ClientWindow.xml"/>
+  <Include file="ServerWindow.xml"/>
+  <Include file="RollRequestWindow.xml"/>
+  <Include file="ServerLootEditWindow.xml"/>
+  <Include file="ServerMembersEditWindow.xml"/>
+  <Include file="ServerImportWindow.xml"/>
+  <Include file="ServerExportWindow.xml"/>
+  
+</Ui>
\ No newline at end of file
diff --git a/addon.xml b/addon.xml
new file mode 100644
index 0000000..a4d5ce3
--- /dev/null
+++ b/addon.xml
@@ -0,0 +1,18 @@
+<Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+  
+  <Include file="libs\libs.xml"/>
+  
+  
+  <Script file="LootReserve.lua"/>
+  <Script file="Constants.lua"/>
+  <Script file="ItemSearch.lua"/>
+  <Script file="Client.lua"/>
+  <Script file="Server.lua"/>
+  <Script file="Comm.lua"/>
+  <Script file="Data.lua"/>
+  <Script file="ItemConditions.lua"/>
+  
+  
+  <Include file="Windows\windows.xml"/>
+  
+</Ui>
\ No newline at end of file
diff --git a/embeds.xml b/embeds.xml
deleted file mode 100644
index 4cdbd2c..0000000
--- a/embeds.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.blizzard.com/wow/ui/">
-	<Script file="Libs\LibStub\LibStub.lua"/>
-	<Script file="Libs\UTF8\utf8data.lua"/>
-	<Script file="Libs\UTF8\utf8.lua"/>
-	<Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
-	<Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
-	<Include file="Libs\AceComm-3.0\AceComm-3.0.xml"/>
-	<Include file="Libs\LibCustomGlow-1.0\LibCustomGlow-1.0.xml"/>
-	<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
-	<Include file="Libs\LibDBIcon-1.0\lib.xml"/>
-	<Include file="Libs\LibDeflate\lib.xml"/>
-	
-	<Script file="Libs\LibRangeCheck-2.0\LibRangeCheck-2.0.lua"/>
-	
-	<Include file="Libs\ItemCache\ItemCache.xml"/>
-</Ui>