diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts-beans.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts-beans.xml
deleted file mode 100644
index bd7ec9b..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts-beans.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="accounts/account-cleanup-bean.xml" />
-	<import resource="accounts/account-management-bean.xml" />
-	<import resource="accounts/admin-dao-bean.xml" />
-	<import resource="accounts/admin-recap-bean.xml" />
-	<import resource="accounts/administration-bean.xml" />
-	<import resource="accounts/bans-dao-bean.xml" />
-	<import resource="accounts/bans-processor-bean.xml" />
-	<import resource="accounts/default-preferences-bean.xml" />
-	<import resource="accounts/ip-ban-bean.xml" />
-	<import resource="accounts/preference-definitions-bean.xml" />
-	<import resource="accounts/preferences-dao-bean.xml" />
-	<import resource="accounts/quit-processor-bean.xml" />
-	<import resource="accounts/requests-expiration-bean.xml" />
-	<import resource="accounts/user-session-dao-bean.xml" />
-	<import resource="accounts/users-dao-bean.xml" />
-	<import resource="accounts/vacation-processor-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-cleanup-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-cleanup-bean.xml
deleted file mode 100644
index e1c6a61..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-cleanup-bean.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="accountCleanup" class="com.deepclone.lw.beans.acm.AccountCleanupBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-management-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-management-bean.xml
deleted file mode 100644
index 6062c6a..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/account-management-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="accountManagement" class="com.deepclone.lw.beans.acm.AccountManagementBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-dao-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-dao-bean.xml
deleted file mode 100644
index 8640f69..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="adminDao" class="com.deepclone.lw.beans.admin.AdminDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/administration-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/administration-bean.xml
deleted file mode 100644
index 1039d63..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/administration-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="administration" class="com.deepclone.lw.beans.admin.AdministrationBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-dao-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-dao-bean.xml
deleted file mode 100644
index f654c86..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="bansDao" class="com.deepclone.lw.beans.admin.BansDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-processor-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-processor-bean.xml
deleted file mode 100644
index 4167e63..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/bans-processor-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="bansProcessor" class="com.deepclone.lw.beans.admin.BansProcessorBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/default-preferences-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/default-preferences-bean.xml
deleted file mode 100644
index e7bca93..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/default-preferences-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="defaultPreferences" class="com.deepclone.lw.beans.prefs.DefaultPreferencesBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/ip-ban-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/ip-ban-bean.xml
deleted file mode 100644
index 2c70cf8..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/ip-ban-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="ipBan" class="com.deepclone.lw.beans.admin.IpBanBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preference-definitions-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preference-definitions-bean.xml
deleted file mode 100644
index 73dfc57..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preference-definitions-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="preferenceDefinitions" class="com.deepclone.lw.beans.prefs.PreferenceDefinitionsBean" />
-	<bean id="preferenceTypesRegistry" class="com.deepclone.lw.beans.prefs.PreferenceTypesRegistryBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preferences-dao-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preferences-dao-bean.xml
deleted file mode 100644
index 42926c3..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/preferences-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="preferencesDAO" class="com.deepclone.lw.beans.prefs.PreferencesDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/quit-processor-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/quit-processor-bean.xml
deleted file mode 100644
index a571d09..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/quit-processor-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="quitProcessor" class="com.deepclone.lw.beans.acm.QuitProcessorBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/requests-expiration-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/requests-expiration-bean.xml
deleted file mode 100644
index f4525e4..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/requests-expiration-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="requestsExpiration" class="com.deepclone.lw.beans.acm.RequestsExpirationBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/user-session-dao-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/user-session-dao-bean.xml
deleted file mode 100644
index 0c7e785..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/user-session-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="userSessionDao" class="com.deepclone.lw.beans.acm.UserSessionDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/users-dao-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/users-dao-bean.xml
deleted file mode 100644
index 817940f..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/users-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="usersDAO" class="com.deepclone.lw.beans.acm.UsersDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/vacation-processor-bean.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/vacation-processor-bean.xml
deleted file mode 100644
index 2c67fea..0000000
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/vacation-processor-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="vacationProcessor" class="com.deepclone.lw.beans.acm.VacationProcessorBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/meta/accounts.xml b/legacyworlds-server-beans-accounts/src/main/resources/configuration/meta/accounts.xml
new file mode 100644
index 0000000..98207c4
--- /dev/null
+++ b/legacyworlds-server-beans-accounts/src/main/resources/configuration/meta/accounts.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+	<bean id="accountCleanup" class="com.deepclone.lw.beans.acm.AccountCleanupBean" />
+	<bean id="accountManagement" class="com.deepclone.lw.beans.acm.AccountManagementBean" />
+	<bean id="adminDao" class="com.deepclone.lw.beans.admin.AdminDAOBean" />
+	<bean id="administration" class="com.deepclone.lw.beans.admin.AdministrationBean" />
+	<bean id="adminRecap" class="com.deepclone.lw.beans.admin.AdminRecapBean" />
+	<bean id="bansDao" class="com.deepclone.lw.beans.admin.BansDAOBean" />
+	<bean id="bansProcessor" class="com.deepclone.lw.beans.admin.BansProcessorBean" />
+	<bean id="defaultPreferences" class="com.deepclone.lw.beans.prefs.DefaultPreferencesBean" />
+	<bean id="ipBan" class="com.deepclone.lw.beans.admin.IpBanBean" />
+	<bean id="preferenceDefinitions" class="com.deepclone.lw.beans.prefs.PreferenceDefinitionsBean" />
+	<bean id="preferencesDAO" class="com.deepclone.lw.beans.prefs.PreferencesDAOBean" />
+	<bean id="preferenceTypesRegistry"
+		class="com.deepclone.lw.beans.prefs.PreferenceTypesRegistryBean" />
+	<bean id="quitProcessor" class="com.deepclone.lw.beans.acm.QuitProcessorBean" />
+	<bean id="requestsExpiration" class="com.deepclone.lw.beans.acm.RequestsExpirationBean" />
+	<bean id="usersDAO" class="com.deepclone.lw.beans.acm.UsersDAOBean" />
+	<bean id="userSessionDao" class="com.deepclone.lw.beans.acm.UserSessionDAOBean" />
+	<bean id="vacationProcessor" class="com.deepclone.lw.beans.acm.VacationProcessorBean" />
+
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt-beans.xml b/legacyworlds-server-beans-bt/src/main/resources/configuration/bt-beans.xml
deleted file mode 100644
index 2673721..0000000
--- a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt-beans.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="bt/admin-bugs-bean.xml" />
-	<import resource="bt/bugs-dao-bean.xml" />
-	<import resource="bt/empire-summary-bean.xml" />
-	<import resource="bt/player-bugs-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/admin-bugs-bean.xml b/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/admin-bugs-bean.xml
deleted file mode 100644
index 5ddaaca..0000000
--- a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/admin-bugs-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="adminBugs" class="com.deepclone.lw.beans.bt.AdminBugsBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/bugs-dao-bean.xml b/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/bugs-dao-bean.xml
deleted file mode 100644
index 3850ac1..0000000
--- a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/bugs-dao-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="bugsDAO" class="com.deepclone.lw.beans.bt.BugsDAOBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/empire-summary-bean.xml b/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/empire-summary-bean.xml
deleted file mode 100644
index a268802..0000000
--- a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/empire-summary-bean.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="empireSummary" class="com.deepclone.lw.beans.bt.es.EmpireSummaryBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/player-bugs-bean.xml b/legacyworlds-server-beans-bt/src/main/resources/configuration/meta/bt.xml
similarity index 52%
rename from legacyworlds-server-beans-bt/src/main/resources/configuration/bt/player-bugs-bean.xml
rename to legacyworlds-server-beans-bt/src/main/resources/configuration/meta/bt.xml
index 47c377f..d96389c 100644
--- a/legacyworlds-server-beans-bt/src/main/resources/configuration/bt/player-bugs-bean.xml
+++ b/legacyworlds-server-beans-bt/src/main/resources/configuration/meta/bt.xml
@@ -2,8 +2,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
+	<bean id="adminBugs" class="com.deepclone.lw.beans.bt.AdminBugsBean" />
+	<bean id="bugsDAO" class="com.deepclone.lw.beans.bt.BugsDAOBean" />
+	<bean id="empireSummary" class="com.deepclone.lw.beans.bt.es.EmpireSummaryBean" />
 	<bean id="playerBugs" class="com.deepclone.lw.beans.bt.PlayerBugsBean" />
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog-beans.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog-beans.xml
deleted file mode 100644
index 934a2d8..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog-beans.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="eventlog/admin-error-mail-bean.xml" />
-	<import resource="eventlog/log-cleaner-bean.xml" />
-	<import resource="eventlog/log-reader-bean.xml" />
-	<import resource="eventlog/log-writer-bean.xml" />
-	<import resource="eventlog/logger-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/admin-error-mail-bean.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/admin-error-mail-bean.xml
deleted file mode 100644
index f0e6a6e..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/admin-error-mail-bean.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="adminErrorMail" class="com.deepclone.lw.beans.eventlog.AdminErrorMailBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-cleaner-bean.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-cleaner-bean.xml
deleted file mode 100644
index 7773c57..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-cleaner-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="logCleaner" class="com.deepclone.lw.beans.eventlog.LogCleanerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-reader-bean.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-reader-bean.xml
deleted file mode 100644
index 1e56da0..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-reader-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="logReader" class="com.deepclone.lw.beans.eventlog.LogReaderBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-writer-bean.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-writer-bean.xml
deleted file mode 100644
index 21fc777..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/log-writer-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="logWriter" class="com.deepclone.lw.beans.eventlog.LogWriterBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/logger-bean.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/logger-bean.xml
deleted file mode 100644
index 22b1347..0000000
--- a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/eventlog/logger-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="logger" class="com.deepclone.lw.beans.eventlog.LoggerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-eventlog/src/main/resources/configuration/meta/eventlog.xml b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/meta/eventlog.xml
new file mode 100644
index 0000000..7841904
--- /dev/null
+++ b/legacyworlds-server-beans-eventlog/src/main/resources/configuration/meta/eventlog.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+	<bean id="adminErrorMail" class="com.deepclone.lw.beans.eventlog.AdminErrorMailBean" />
+	<bean id="logCleaner" class="com.deepclone.lw.beans.eventlog.LogCleanerBean" />
+	<bean id="logger" class="com.deepclone.lw.beans.eventlog.LoggerBean" />
+	<bean id="logReader" class="com.deepclone.lw.beans.eventlog.LogReaderBean" />
+	<bean id="logWriter" class="com.deepclone.lw.beans.eventlog.LogWriterBean" />
+
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n-beans.xml b/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n-beans.xml
deleted file mode 100644
index bfaaebb..0000000
--- a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n-beans.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="i18n/i18n-manager-bean.xml" />
-	<import resource="i18n/i18n-translator-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-manager-bean.xml b/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-manager-bean.xml
deleted file mode 100644
index a683f48..0000000
--- a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-manager-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="i18nManager" class="com.deepclone.lw.beans.i18n.I18NManagerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-translator-bean.xml b/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-translator-bean.xml
deleted file mode 100644
index 9118332..0000000
--- a/legacyworlds-server-beans-i18n/src/main/resources/configuration/i18n/i18n-translator-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-                        
-	<bean id="i18nTranslator" class="com.deepclone.lw.beans.i18n.TranslatorBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-updates/src/main/resources/configuration/game.xml b/legacyworlds-server-beans-i18n/src/main/resources/configuration/meta/i18n.xml
similarity index 65%
rename from legacyworlds-server-beans-updates/src/main/resources/configuration/game.xml
rename to legacyworlds-server-beans-i18n/src/main/resources/configuration/meta/i18n.xml
index 687e57a..dc21c5b 100644
--- a/legacyworlds-server-beans-updates/src/main/resources/configuration/game.xml
+++ b/legacyworlds-server-beans-i18n/src/main/resources/configuration/meta/i18n.xml
@@ -4,6 +4,7 @@
 	xsi:schemaLocation="
                         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<import resource="game/updates.xml" />
+	<bean id="i18nManager" class="com.deepclone.lw.beans.i18n.I18NManagerBean" />
+	<bean id="i18nTranslator" class="com.deepclone.lw.beans.i18n.TranslatorBean" />
 
 </beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer/mailer-bean.xml b/legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer/mailer-bean.xml
deleted file mode 100644
index a430dd0..0000000
--- a/legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer/mailer-bean.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<!-- Mailer bean - all properties autowired or defaulted -->
-	<bean id="mailer" class="com.deepclone.lw.beans.mailer.MailerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer-beans.xml b/legacyworlds-server-beans-mailer/src/main/resources/configuration/meta/mailer.xml
similarity index 74%
rename from legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer-beans.xml
rename to legacyworlds-server-beans-mailer/src/main/resources/configuration/meta/mailer.xml
index e5e284f..cceb640 100644
--- a/legacyworlds-server-beans-mailer/src/main/resources/configuration/mailer-beans.xml
+++ b/legacyworlds-server-beans-mailer/src/main/resources/configuration/meta/mailer.xml
@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<import resource="mailer/mailer-bean.xml" />
+	<bean id="mailer" class="com.deepclone.lw.beans.mailer.MailerBean" />
 	<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
 		<property name="host" value="127.0.0.1" />
 	</bean>
diff --git a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming/naming-dao-bean.xml b/legacyworlds-server-beans-naming/src/main/resources/configuration/meta/naming.xml
similarity index 69%
rename from legacyworlds-server-beans-naming/src/main/resources/configuration/naming/naming-dao-bean.xml
rename to legacyworlds-server-beans-naming/src/main/resources/configuration/meta/naming.xml
index 0a3dfe5..f63e0df 100644
--- a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming/naming-dao-bean.xml
+++ b/legacyworlds-server-beans-naming/src/main/resources/configuration/meta/naming.xml
@@ -2,8 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
+	<bean id="namesManager" class="com.deepclone.lw.beans.naming.NamesManagerBean" />
 	<bean id="namingDAO" class="com.deepclone.lw.beans.naming.NamingDAOBean" />
 
 </beans>
diff --git a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming-beans.xml b/legacyworlds-server-beans-naming/src/main/resources/configuration/naming-beans.xml
deleted file mode 100644
index f4ab8cc..0000000
--- a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming-beans.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="naming/names-manager-bean.xml" />
-	<import resource="naming/naming-dao-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming/names-manager-bean.xml b/legacyworlds-server-beans-naming/src/main/resources/configuration/naming/names-manager-bean.xml
deleted file mode 100644
index 060f506..0000000
--- a/legacyworlds-server-beans-naming/src/main/resources/configuration/naming/names-manager-bean.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="namesManager" class="com.deepclone.lw.beans.naming.NamesManagerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-resources/src/main/resources/configuration/game/resources-beans.xml b/legacyworlds-server-beans-resources/src/main/resources/configuration/game/resources.xml
similarity index 100%
rename from legacyworlds-server-beans-resources/src/main/resources/configuration/game/resources-beans.xml
rename to legacyworlds-server-beans-resources/src/main/resources/configuration/game/resources.xml
diff --git a/legacyworlds-server-beans-simple/src/main/resources/configuration/game.xml b/legacyworlds-server-beans-simple/src/main/resources/configuration/game.xml
deleted file mode 100644
index 952f3f6..0000000
--- a/legacyworlds-server-beans-simple/src/main/resources/configuration/game.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
-
-	<import resource="game/resources-beans.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-simple/src/main/resources/configuration/simple-beans.xml b/legacyworlds-server-beans-simple/src/main/resources/configuration/simple.xml
similarity index 100%
rename from legacyworlds-server-beans-simple/src/main/resources/configuration/simple-beans.xml
rename to legacyworlds-server-beans-simple/src/main/resources/configuration/simple.xml
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system/session-manager-bean.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/meta/system.xml
similarity index 54%
rename from legacyworlds-server-beans-system/src/main/resources/configuration/system/session-manager-bean.xml
rename to legacyworlds-server-beans-system/src/main/resources/configuration/meta/system.xml
index dcddd03..7728e8d 100644
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system/session-manager-bean.xml
+++ b/legacyworlds-server-beans-system/src/main/resources/configuration/meta/system.xml
@@ -7,15 +7,23 @@
 	<bean id="authChallengeGenerator" class="com.deepclone.lw.utils.RandomStringGenerator">
 		<qualifier value="authChallenges" />
 		<property name="length" value="100" />
-		<property name="characterSet" value="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" />
+		<property name="characterSet"
+			value="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" />
 	</bean>
 
+	<bean id="constantsManager" class="com.deepclone.lw.beans.sys.ConstantsManagerBean" />
+	<bean id="constantsRegistrar" class="com.deepclone.lw.beans.sys.ConstantsRegistrarBean" />
+
 	<bean id="sessionIDGenerator" class="com.deepclone.lw.utils.RandomStringGenerator">
 		<qualifier value="sessionIdentifiers" />
 		<property name="length" value="50" />
-		<property name="characterSet" value="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" />
+		<property name="characterSet"
+			value="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" />
 	</bean>
 
 	<bean id="sessionManager" class="com.deepclone.lw.beans.sys.SessionManagerBean" />
+	<bean id="systemStatus" class="com.deepclone.lw.beans.sys.SystemStatusBean" />
+	<bean id="ticker" class="com.deepclone.lw.beans.sys.TickerBean" />
+	<bean id="tickerManager" class="com.deepclone.lw.beans.sys.TickerManagerBean" />
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system-beans.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/system-beans.xml
deleted file mode 100644
index 7d0a16e..0000000
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system-beans.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="system/constants-manager-bean.xml" />
-	<import resource="system/constants-registrar-bean.xml" />
-	<import resource="system/ticker-bean.xml" />
-	<import resource="system/session-manager-bean.xml" />
-	<import resource="system/system-status-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-manager-bean.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-manager-bean.xml
deleted file mode 100644
index 3603ae6..0000000
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-manager-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="constantsManager" class="com.deepclone.lw.beans.sys.ConstantsManagerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-registrar-bean.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-registrar-bean.xml
deleted file mode 100644
index 3fa577d..0000000
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system/constants-registrar-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="constantsRegistrar" class="com.deepclone.lw.beans.sys.ConstantsRegistrarBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system/system-status-bean.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/system/system-status-bean.xml
deleted file mode 100644
index f8b97f4..0000000
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system/system-status-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="systemStatus" class="com.deepclone.lw.beans.sys.SystemStatusBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-system/src/main/resources/configuration/system/ticker-bean.xml b/legacyworlds-server-beans-system/src/main/resources/configuration/system/ticker-bean.xml
deleted file mode 100644
index 894c846..0000000
--- a/legacyworlds-server-beans-system/src/main/resources/configuration/system/ticker-bean.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="tickerManager" class="com.deepclone.lw.beans.sys.TickerManagerBean" />
-	<bean id="ticker" class="com.deepclone.lw.beans.sys.TickerBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/session-command-wiring-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/meta/sessions.xml
similarity index 56%
rename from legacyworlds-server-beans-user/src/main/resources/configuration/user/session-command-wiring-bean.xml
rename to legacyworlds-server-beans-user/src/main/resources/configuration/meta/sessions.xml
index da9ba6d..611aa59 100644
--- a/legacyworlds-server-beans-user/src/main/resources/configuration/user/session-command-wiring-bean.xml
+++ b/legacyworlds-server-beans-user/src/main/resources/configuration/meta/sessions.xml
@@ -2,8 +2,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
+	<bean id="objectNameValidator" class="com.deepclone.lw.beans.user.ObjectNameValidatorBean" />
 	<bean id="sessionCommandWiring" class="com.deepclone.lw.beans.user.abst.SessionCommandWiringBean" />
+	<bean id="sessionSubTypeWiring" class="com.deepclone.lw.beans.user.abst.SessionSubTypeWiringBean" />
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-recap-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/session-types.xml
similarity index 65%
rename from legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-recap-bean.xml
rename to legacyworlds-server-beans-user/src/main/resources/configuration/session-types.xml
index 4d609ab..e52899d 100644
--- a/legacyworlds-server-beans-accounts/src/main/resources/configuration/accounts/admin-recap-bean.xml
+++ b/legacyworlds-server-beans-user/src/main/resources/configuration/session-types.xml
@@ -4,6 +4,8 @@
 	xsi:schemaLocation="
                         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	<bean id="adminRecap" class="com.deepclone.lw.beans.admin.AdminRecapBean" />
+	<import resource="session-types/administration.xml" />
+	<import resource="session-types/external.xml" />
+	<import resource="session-types/player.xml" />
 
-</beans>
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/admin-session-definer-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/session-types/administration.xml
similarity index 100%
rename from legacyworlds-server-beans-user/src/main/resources/configuration/user/admin-session-definer-bean.xml
rename to legacyworlds-server-beans-user/src/main/resources/configuration/session-types/administration.xml
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/external-session-definer-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/session-types/external.xml
similarity index 100%
rename from legacyworlds-server-beans-user/src/main/resources/configuration/user/external-session-definer-bean.xml
rename to legacyworlds-server-beans-user/src/main/resources/configuration/session-types/external.xml
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/player-session-definer-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/session-types/player.xml
similarity index 100%
rename from legacyworlds-server-beans-user/src/main/resources/configuration/user/player-session-definer-bean.xml
rename to legacyworlds-server-beans-user/src/main/resources/configuration/session-types/player.xml
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user-beans.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/user-beans.xml
deleted file mode 100644
index 3c1c824..0000000
--- a/legacyworlds-server-beans-user/src/main/resources/configuration/user-beans.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<import resource="user/admin-session-definer-bean.xml" />
-	<import resource="user/external-session-definer-bean.xml" />
-	<import resource="user/object-name-validator-bean.xml" />
-	<import resource="user/player-session-definer-bean.xml" />
-	<import resource="user/session-command-wiring-bean.xml" />
-	<import resource="user/session-subtype-wiring-bean.xml" />
-
-</beans>
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/object-name-validator-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/user/object-name-validator-bean.xml
deleted file mode 100644
index 7d06f66..0000000
--- a/legacyworlds-server-beans-user/src/main/resources/configuration/user/object-name-validator-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="objectNameValidator" class="com.deepclone.lw.beans.user.ObjectNameValidatorBean" />
-
-</beans>
diff --git a/legacyworlds-server-beans-user/src/main/resources/configuration/user/session-subtype-wiring-bean.xml b/legacyworlds-server-beans-user/src/main/resources/configuration/user/session-subtype-wiring-bean.xml
deleted file mode 100644
index 5713773..0000000
--- a/legacyworlds-server-beans-user/src/main/resources/configuration/user/session-subtype-wiring-bean.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<bean id="sessionSubTypeWiring" class="com.deepclone.lw.beans.user.abst.SessionSubTypeWiringBean" />
-
-</beans>
diff --git a/legacyworlds-server-data/src/main/resources/configuration/transaction-bean.xml b/legacyworlds-server-data/src/main/resources/configuration/transaction-bean.xml
deleted file mode 100644
index 6cf7b29..0000000
--- a/legacyworlds-server-data/src/main/resources/configuration/transaction-bean.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-	<tx:annotation-driven transaction-manager="transactionManager"/>
-
-</beans>
diff --git a/legacyworlds-server-main/src/main/resources/configuration/context-configuration.xml b/legacyworlds-server-main/src/main/resources/configuration/context-configuration.xml
deleted file mode 100644
index 11e1a81..0000000
--- a/legacyworlds-server-main/src/main/resources/configuration/context-configuration.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
-	<context:annotation-config />
-
-</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-main/src/main/resources/configuration/game.xml b/legacyworlds-server-main/src/main/resources/configuration/game.xml
new file mode 100644
index 0000000..2702f02
--- /dev/null
+++ b/legacyworlds-server-main/src/main/resources/configuration/game.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+	<!-- ========================================================== -->
+	<!-- Spring configuration loader for all "real" game components -->
+	<!-- ========================================================== -->
+	<import resource="game/resources.xml" />
+	<import resource="game/updates.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-main/src/main/resources/configuration/meta.xml b/legacyworlds-server-main/src/main/resources/configuration/meta.xml
new file mode 100644
index 0000000..69924f6
--- /dev/null
+++ b/legacyworlds-server-main/src/main/resources/configuration/meta.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+	<!-- ================================================= -->
+	<!-- Spring configuration loader for "meta" components -->
+	<!-- ================================================= -->
+	<import resource="meta/accounts.xml" />
+	<import resource="meta/bt.xml" />
+	<import resource="meta/eventlog.xml" />
+	<import resource="meta/i18n.xml" />
+	<import resource="meta/mailer.xml" />
+	<import resource="meta/naming.xml" />
+	<import resource="meta/sessions.xml" />
+	<import resource="meta/system.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/legacyworlds-server-main/src/main/resources/configuration/transactions.xml b/legacyworlds-server-main/src/main/resources/configuration/transactions.xml
new file mode 100644
index 0000000..3e20eb9
--- /dev/null
+++ b/legacyworlds-server-main/src/main/resources/configuration/transactions.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
+
+	<bean id="transactionManager"
+		class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+	<tx:annotation-driven transaction-manager="transactionManager" />
+
+</beans>
diff --git a/legacyworlds-server-main/src/main/resources/lw-server.xml b/legacyworlds-server-main/src/main/resources/lw-server.xml
index 081b882..07a0a74 100644
--- a/legacyworlds-server-main/src/main/resources/lw-server.xml
+++ b/legacyworlds-server-main/src/main/resources/lw-server.xml
@@ -2,30 +2,31 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+                        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
+	<!-- ================================================== -->
+	<!-- Legacy Worlds server - Spring configuration loader -->
+	<!-- ================================================== -->
+
+	<!-- Use annotations to determine component wiring -->
 	<context:annotation-config />
 
-	<!-- Server terminator bean -->
+	<!-- Transaction manager -->
+	<import resource="configuration/transactions.xml" />
+
+	<!-- Server terminator -->
 	<bean id="terminator" class="com.deepclone.lw.srv.ServerTerminatorBean" />
 
-	<!-- Load transaction manager -->
-	<import resource="configuration/transaction-bean.xml" />
+	<!-- "Meta" components -->
+	<import resource="configuration/meta.xml" />
 
-	<!-- Load all system and low-level beans -->
-	<import resource="configuration/accounts-beans.xml" />
-	<import resource="configuration/bt-beans.xml" />
-	<import resource="configuration/eventlog-beans.xml" />
-	<import resource="configuration/i18n-beans.xml" />
-	<import resource="configuration/mailer-beans.xml" />
-	<import resource="configuration/naming-beans.xml" />
-	<import resource="configuration/system-beans.xml" />
-	<import resource="configuration/user-beans.xml" />
+	<!-- Session types and command handlers -->
+	<import resource="configuration/session-types.xml" />
 
-	<!-- Load both the "final" component configuration file and the "simple" 
-		implementation from B6M1. -->
+	<!-- Load both the "final" game file and the "simple" implementation from 
+		B6M1. -->
 	<import resource="configuration/game.xml" />
-	<import resource="configuration/simple-beans.xml" />
+	<import resource="configuration/simple.xml" />
 
 </beans>
diff --git a/legacyworlds/doc/spring-configuration.txt b/legacyworlds/doc/spring-configuration.txt
new file mode 100644
index 0000000..2eda413
--- /dev/null
+++ b/legacyworlds/doc/spring-configuration.txt
@@ -0,0 +1,77 @@
+Spring configuration files
+===========================
+
+A lot of the game's code (whether on the server side or on the web clients)
+relies on the Spring framework. For most of the components, it is easier to
+use XML configuration files rather than in-code configuration. This file
+describes the common elements and guidelines to follow for the configuration
+files.
+
+
+Files in the main server package:
+
+	lw-server.xml					Main configuration file
+	
+		This file contains the server's top-level configuration. It enables
+		annotation-based component processing, adds the server termination
+		component, and loads the configuration files for all elements of the
+		server: transaction management, meta components, game components for
+		both the "real" game and the "simple" implementation written for
+		Milestone 1, session type definitions and commands.
+
+	configuration/game.xml			"Real" game components
+
+		This file acts as a loader for all configuration files the load
+		elements of the "real" game - that is, parts of the game which have
+		taken (or are taking) the form they should have in the final version.
+
+	configuration/meta.xml			Meta components
+
+		This file loads the configuration files for all "meta" components.
+		A "meta" component is any component which is not directly related to
+		the game itself, but it still necessary: for example account
+		management or the bug tracking system fall into this category.
+
+	configuration/transactions.xml	Transaction manager configuration
+
+		This file contains the configuration for Spring's transaction
+		management system. It defines the transaction manager and enables
+		annotation-based transaction processing.
+
+
+Files in general component definition packages:
+
+	Most of the component definition packages will include one single
+	configuration file which loads the components the package defines. This
+	file will be found in either configuration/meta/ or configuration/game/
+	depending on the purpose of the components. The file in question will
+	be loaded from the corresponding file in the main server package.
+
+
+Files in the legacyworlds-server-beans-simple package:
+
+	This package includes its own top-level configuration file, unsurprisingly
+	named configuration/simple.xml, which is included in the server's top-level
+	configuration and loads all files in the configuration/simple/
+	sub-directory. Since it corresponds to Milestone 1's "simple" game
+	implementation, it should only be modified to remove components as they
+	are moved or replaced.
+
+
+Files in the legacyworlds-server-beans-user package:
+
+	This package includes a "meta" components configuration file, which loads
+	low-level session management components. In addition, it features the
+	following configuration files:
+	
+		configuration/session-types.xml		Session types loader
+
+			This file loads the configuration files for each specific type of
+			session.
+
+		configuration/session-types/		Session types definitions
+
+			This directory contains configuration files which loads all
+			components for some type of session. Each file should therefore
+			load at least one session definer component, and a bunch of
+			command handling components.
\ No newline at end of file