diff --git a/L2J_Mobius_1.0_Ertheia/build.xml b/L2J_Mobius_1.0_Ertheia/build.xml
index 0804f07224..8ebc020c17 100644
--- a/L2J_Mobius_1.0_Ertheia/build.xml
+++ b/L2J_Mobius_1.0_Ertheia/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_2.5_Underground/build.xml b/L2J_Mobius_2.5_Underground/build.xml
index 50c20d3ca0..17e7126c6d 100644
--- a/L2J_Mobius_2.5_Underground/build.xml
+++ b/L2J_Mobius_2.5_Underground/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_3.0_Helios/build.xml b/L2J_Mobius_3.0_Helios/build.xml
index b4c0d1ca8b..203b2261f6 100644
--- a/L2J_Mobius_3.0_Helios/build.xml
+++ b/L2J_Mobius_3.0_Helios/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_4.0_GrandCrusade/build.xml b/L2J_Mobius_4.0_GrandCrusade/build.xml
index e308df30a4..9943b9ec95 100644
--- a/L2J_Mobius_4.0_GrandCrusade/build.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_5.0_Salvation/build.xml b/L2J_Mobius_5.0_Salvation/build.xml
index acfc487e73..939592457d 100644
--- a/L2J_Mobius_5.0_Salvation/build.xml
+++ b/L2J_Mobius_5.0_Salvation/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_5.5_EtinasFate/build.xml b/L2J_Mobius_5.5_EtinasFate/build.xml
index 00c18c25f8..52b761fa4a 100644
--- a/L2J_Mobius_5.5_EtinasFate/build.xml
+++ b/L2J_Mobius_5.5_EtinasFate/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_6.0_Fafurion/build.xml b/L2J_Mobius_6.0_Fafurion/build.xml
index 8096882507..3fa7859328 100644
--- a/L2J_Mobius_6.0_Fafurion/build.xml
+++ b/L2J_Mobius_6.0_Fafurion/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/build.xml b/L2J_Mobius_7.0_PreludeOfWar/build.xml
index d15f1c199c..39aa3fa916 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/build.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_8.0_Homunculus/build.xml b/L2J_Mobius_8.0_Homunculus/build.xml
index a737917119..3c50a686fe 100644
--- a/L2J_Mobius_8.0_Homunculus/build.xml
+++ b/L2J_Mobius_8.0_Homunculus/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/build.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/build.xml
index 18b054dbb4..1a524d77b4 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/build.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/build.xml b/L2J_Mobius_C4_ScionsOfDestiny/build.xml
index 29bb068c5b..bef9749dd3 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/build.xml
+++ b/L2J_Mobius_C4_ScionsOfDestiny/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_C6_Interlude/build.xml b/L2J_Mobius_C6_Interlude/build.xml
index 709a774d62..7c2a291366 100644
--- a/L2J_Mobius_C6_Interlude/build.xml
+++ b/L2J_Mobius_C6_Interlude/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/build.xml b/L2J_Mobius_CT_2.4_Epilogue/build.xml
index 90726ea971..6d51270021 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/build.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_CT_2.6_HighFive/build.xml b/L2J_Mobius_CT_2.6_HighFive/build.xml
index 331fecf61c..6ef91de3ea 100644
--- a/L2J_Mobius_CT_2.6_HighFive/build.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/build.xml b/L2J_Mobius_Classic_2.0_Saviors/build.xml
index ca34dc1828..012fd179d5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/build.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/build.xml b/L2J_Mobius_Classic_2.1_Zaken/build.xml
index 0d4997abc6..c8a9ae7877 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/build.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/build.xml b/L2J_Mobius_Classic_2.2_Antharas/build.xml
index c31a783e67..e9e497b618 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/build.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/build.xml b/L2J_Mobius_Classic_2.3_SevenSigns/build.xml
index 61c58cbc90..a39cb57152 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/build.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml
index c78308d1a1..f9d6300300 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/build.xml b/L2J_Mobius_Classic_3.0_TheKamael/build.xml
index 2fa344c1cb..5c18eec25b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/build.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Classic_Interlude/build.xml b/L2J_Mobius_Classic_Interlude/build.xml
index a71f94554f..d48c1e9297 100644
--- a/L2J_Mobius_Classic_Interlude/build.xml
+++ b/L2J_Mobius_Classic_Interlude/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/build.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/build.xml
index 138a5c7c0c..c7c950d389 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/build.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/build.xml b/L2J_Mobius_Essence_5.0_Sylph/build.xml
index 9e04f13cfe..ecae1900e9 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/build.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/build.xml
@@ -102,7 +102,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_GS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
@@ -117,7 +118,8 @@
 		<jar destfile="${build.dist.dbinstaller}/Database_Installer_LS.jar" level="9">
 			<fileset dir="${build.bin}">
 				<include name="**/dbinstaller/**" />
-				<include name="**/util/**" />
+				<include name="**/commons/ui/**" />
+				<include name="**/commons/util/**" />
 				<include name="**/SQLFilter**" />
 				<exclude name="**/LauncherGS*" />
 			</fileset>