diff --git a/GameServer/alert-config.xml b/GameServer/conf/alert-config.xml
similarity index 100%
rename from GameServer/alert-config.xml
rename to GameServer/conf/alert-config.xml
diff --git a/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala b/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
index fb9c39d..c294820 100644
--- a/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
+++ b/GameServer/src/org/moparscape/msc/gs/alert/AlertHandler.scala
@@ -140,7 +140,7 @@ private trait ServiceTrait {
 private object EMail extends ServiceTrait {
   override def send(msg: String, recip: String) = {
     val props = new Properties()
-    val config = XML.loadFile("alert-config.xml") \\ "credentials"
+    val config = XML.loadFile(Config.ALERT_CONFIG) \\ "credentials"
     val sender = config \ "user" text
     val pass = config \ "pass" text
     val host = config \ "host" text
diff --git a/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java b/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java
index 59b40d5..1ff9267 100644
--- a/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java
+++ b/GameServer/src/org/moparscape/msc/gs/db/ReportHandlerQueries.java
@@ -29,7 +29,7 @@ public class ReportHandlerQueries {
 			insertNewReportRow = db
 					.getConnection()
 					.prepareStatement(
-							"INSERT INTO `msc2_reports` (`from`, `about`, `time`, `reason`, `snapshot_from`,`snapshot_about`,`chatlogs`, `from_x`, `from_y`, `about_x`, `about_y`) VALUES(?,?,?,?,?,?,?,?,?,?,?)");
+							"INSERT INTO `pk_reports` (`from`, `about`, `time`, `reason`, `snapshot_from`,`snapshot_about`,`chatlogs`, `from_x`, `from_y`, `about_x`, `about_y`) VALUES(?,?,?,?,?,?,?,?,?,?,?)");
 			insertNewDupeDataRow = db
 					.getConnection()
 					.prepareStatement(
diff --git a/LoginServer/logs/err.log b/LoginServer/logs/err.log
index e69de29..4d8001c 100644
--- a/LoginServer/logs/err.log
+++ b/LoginServer/logs/err.log
@@ -0,0 +1,234 @@
+01:19:17 25-06-11: Exception in thread "pool-4-thread-1" 
+01:19:17 25-06-11: java.lang.Error: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1116)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: java.lang.Error: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1116)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: Caused by: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.io.FileInputStream.open(Native Method)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:137)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:96)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at scala.xml.Source$.fromFile(XML.scala:24)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at scala.xml.factory.XMLLoader$class.loadFile(XMLLoader.scala:49)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at scala.xml.XML$.loadFile(XML.scala:40)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.EMail$.send(AlertHandler.scala:143)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:104)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:104)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.Service$.send(AlertHandler.scala:112)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:39)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:38)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at scala.collection.immutable.Map$Map1.foreach(Map.scala:118)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1.run(AlertHandler.scala:38)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
+01:19:17 25-06-11: 
+
+01:19:17 25-06-11: 	... 2 more
+01:19:17 25-06-11: 
+
+01:21:50 25-06-11: Exception in thread "pool-4-thread-1" 
+01:21:50 25-06-11: java.lang.Error: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1116)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: Caused by: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.io.FileInputStream.open(Native Method)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:137)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:96)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at scala.xml.Source$.fromFile(XML.scala:24)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at scala.xml.factory.XMLLoader$class.loadFile(XMLLoader.scala:49)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at scala.xml.XML$.loadFile(XML.scala:40)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.EMail$.send(AlertHandler.scala:143)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:104)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:104)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.Service$.send(AlertHandler.scala:112)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.Service$.send(AlertHandler.scala:112)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:39)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:38)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.Service$.send(AlertHandler.scala:112)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:39)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:38)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at scala.collection.immutable.Map$Map1.foreach(Map.scala:118)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1.run(AlertHandler.scala:38)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
+01:21:50 25-06-11: 
+
+01:21:50 25-06-11: 	... 2 more
+01:21:50 25-06-11: 
+
+01:23:20 25-06-11: Exception in thread "pool-4-thread-1" 
+01:23:20 25-06-11: java.lang.Error: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1116)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.lang.Thread.run(Thread.java:636)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: Caused by: java.io.FileNotFoundException: alert-config.xml (No such file or directory)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.io.FileInputStream.open(Native Method)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:137)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.io.FileInputStream.<init>(FileInputStream.java:96)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at scala.xml.Source$.fromFile(XML.scala:24)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at scala.xml.factory.XMLLoader$class.loadFile(XMLLoader.scala:49)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at scala.xml.XML$.loadFile(XML.scala:40)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.EMail$.send(AlertHandler.scala:144)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:105)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.Service$$anonfun$3.apply(AlertHandler.scala:105)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.Service$.send(AlertHandler.scala:113)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:39)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:38)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at scala.collection.immutable.Map$Map1.foreach(Map.scala:118)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1$$anonfun$run$1.apply(AlertHandler.scala:38)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at scala.collection.immutable.Map$Map1.foreach(Map.scala:118)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at org.moparscape.msc.gs.alert.AlertHandler$$anon$1.run(AlertHandler.scala:38)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
+01:23:20 25-06-11: 
+
+01:23:20 25-06-11: 	... 2 more
+01:23:20 25-06-11: 
+