diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
deleted file mode 100644
index 40ebceb..0000000
--- a/config/pmd-ruleset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<ruleset level="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>
-  This ruleset checks my code for bad stuff
-    </description>
-
-	<!--
-        rulesets/basic.xml,
-        rulesets/braces.xml,
-        rulesets/clone.xml,
-        rulesets/codesize.xml,
-        rulesets/controversial.xml,
-        rulesets/coupling.xml,
-        rulesets/design.xml,
-        rulesets/finalizers.xml,
-        rulesets/imports.xml,
-        rulesets/j2ee.xml,
-        rulesets/javabeans.xml,
-        rulesets/junit.xml,
-        rulesets/logging-jakarta-commons.xml,
-        rulesets/logging-java.xml,
-        rulesets/migrating.xml,
-        rulesets/naming.xml,
-        rulesets/optimizations.xml,
-        rulesets/strictexception.xml,
-        rulesets/strings.xml,
-        rulesets/sunsecure.xml,
-        rulesets/unusedcode.xml
-        -->
-
-    <rule ref="rulesets/basic.xml">
-        <exclude level="CollapsibleIfStatements"/>
-        <exclude level="UselessOverridingMethod"/>
-        <exclude level="AvoidUsingHardCodedIP"/>
-    </rule>
-    <rule ref="rulesets/braces.xml"/>
-    
-    <!--
-    <rule ref="rulesets/controversial.xml">
-        <exclude level="CallSuperInConstructor"/>
-        <exclude level="DataflowAnomalyAnalysis"/>
-        <exclude level="NullAssignment"/>
-        <exclude level="OnlyOneReturn"/>
-    </rule>
-    -->
-
-    <rule ref="rulesets/coupling.xml">
-        <exclude level="ExcessiveImports"/>
-    </rule>
-    
-    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="rulesets/design.xml/CloseResource"/>
-    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
-    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--
-    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
-    -->
-
-    <rule ref="rulesets/finalizers.xml"/>
-    <rule ref="rulesets/imports.xml"/>
-    <rule ref="rulesets/j2ee.xml"/>
-    <rule ref="rulesets/optimizations.xml">
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="UseStringBufferForStringAppends" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-    </rule>
-
-</ruleset>

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
deleted file mode 100644
index 40ebceb..0000000
--- a/config/pmd-ruleset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<ruleset level="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>
-  This ruleset checks my code for bad stuff
-    </description>
-
-	<!--
-        rulesets/basic.xml,
-        rulesets/braces.xml,
-        rulesets/clone.xml,
-        rulesets/codesize.xml,
-        rulesets/controversial.xml,
-        rulesets/coupling.xml,
-        rulesets/design.xml,
-        rulesets/finalizers.xml,
-        rulesets/imports.xml,
-        rulesets/j2ee.xml,
-        rulesets/javabeans.xml,
-        rulesets/junit.xml,
-        rulesets/logging-jakarta-commons.xml,
-        rulesets/logging-java.xml,
-        rulesets/migrating.xml,
-        rulesets/naming.xml,
-        rulesets/optimizations.xml,
-        rulesets/strictexception.xml,
-        rulesets/strings.xml,
-        rulesets/sunsecure.xml,
-        rulesets/unusedcode.xml
-        -->
-
-    <rule ref="rulesets/basic.xml">
-        <exclude level="CollapsibleIfStatements"/>
-        <exclude level="UselessOverridingMethod"/>
-        <exclude level="AvoidUsingHardCodedIP"/>
-    </rule>
-    <rule ref="rulesets/braces.xml"/>
-    
-    <!--
-    <rule ref="rulesets/controversial.xml">
-        <exclude level="CallSuperInConstructor"/>
-        <exclude level="DataflowAnomalyAnalysis"/>
-        <exclude level="NullAssignment"/>
-        <exclude level="OnlyOneReturn"/>
-    </rule>
-    -->
-
-    <rule ref="rulesets/coupling.xml">
-        <exclude level="ExcessiveImports"/>
-    </rule>
-    
-    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="rulesets/design.xml/CloseResource"/>
-    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
-    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--
-    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
-    -->
-
-    <rule ref="rulesets/finalizers.xml"/>
-    <rule ref="rulesets/imports.xml"/>
-    <rule ref="rulesets/j2ee.xml"/>
-    <rule ref="rulesets/optimizations.xml">
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="UseStringBufferForStringAppends" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-    </rule>
-
-</ruleset>
diff --git a/script/build.xml b/script/build.xml
index 48040ad..acc097d 100644
--- a/script/build.xml
+++ b/script/build.xml
@@ -102,7 +102,6 @@
     <!-- Initialise                                                          -->
     <!-- =================================================================== -->
     <target name="init">
-        <!-- <taskdef resource="${config.dir}/checkstyletask.properties" classpathref="build.class.path" loaderRef="default" /> -->
 
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="build.class.path"
                  loaderRef="default"/>
@@ -166,7 +165,7 @@
     <!-- PMD                                                                 -->
     <!-- =================================================================== -->
     <target name="pmd" depends="prepare">
-        <pmd shortFilenames="true" rulesetfiles="${config.dir}/pmd-ruleset.xml">
+        <pmd shortFilenames="true" rulesetfiles="pmd-ruleset.xml">
             <formatter type="html" toFile="${build.dir}/pmd_report.html"
                        linkPrefix="http://46.137.78.14:8080/job/Eos/javadoc/"/>
             <formatter type="xml" toFile="${build.dir}/pmd.xml"
@@ -197,7 +196,7 @@
         <findbugs home="${build.lib.dir}/findbugs-1.3.9" output="xml" sourcepath="${src.dir}"
                   outputFile="${build.dir}/findbugs.xml"
                   reportLevel="medium"
-                  excludeFilter="${config.dir}/findbug-exclude.xml"
+                  excludeFilter="findbug-exclude.xml"
                   jvmargs="-Xmx512m"
                   timeout="1200000">
 

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
deleted file mode 100644
index 40ebceb..0000000
--- a/config/pmd-ruleset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<ruleset level="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>
-  This ruleset checks my code for bad stuff
-    </description>
-
-	<!--
-        rulesets/basic.xml,
-        rulesets/braces.xml,
-        rulesets/clone.xml,
-        rulesets/codesize.xml,
-        rulesets/controversial.xml,
-        rulesets/coupling.xml,
-        rulesets/design.xml,
-        rulesets/finalizers.xml,
-        rulesets/imports.xml,
-        rulesets/j2ee.xml,
-        rulesets/javabeans.xml,
-        rulesets/junit.xml,
-        rulesets/logging-jakarta-commons.xml,
-        rulesets/logging-java.xml,
-        rulesets/migrating.xml,
-        rulesets/naming.xml,
-        rulesets/optimizations.xml,
-        rulesets/strictexception.xml,
-        rulesets/strings.xml,
-        rulesets/sunsecure.xml,
-        rulesets/unusedcode.xml
-        -->
-
-    <rule ref="rulesets/basic.xml">
-        <exclude level="CollapsibleIfStatements"/>
-        <exclude level="UselessOverridingMethod"/>
-        <exclude level="AvoidUsingHardCodedIP"/>
-    </rule>
-    <rule ref="rulesets/braces.xml"/>
-    
-    <!--
-    <rule ref="rulesets/controversial.xml">
-        <exclude level="CallSuperInConstructor"/>
-        <exclude level="DataflowAnomalyAnalysis"/>
-        <exclude level="NullAssignment"/>
-        <exclude level="OnlyOneReturn"/>
-    </rule>
-    -->
-
-    <rule ref="rulesets/coupling.xml">
-        <exclude level="ExcessiveImports"/>
-    </rule>
-    
-    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="rulesets/design.xml/CloseResource"/>
-    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
-    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--
-    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
-    -->
-
-    <rule ref="rulesets/finalizers.xml"/>
-    <rule ref="rulesets/imports.xml"/>
-    <rule ref="rulesets/j2ee.xml"/>
-    <rule ref="rulesets/optimizations.xml">
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="UseStringBufferForStringAppends" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-    </rule>
-
-</ruleset>
diff --git a/script/build.xml b/script/build.xml
index 48040ad..acc097d 100644
--- a/script/build.xml
+++ b/script/build.xml
@@ -102,7 +102,6 @@
     <!-- Initialise                                                          -->
     <!-- =================================================================== -->
     <target name="init">
-        <!-- <taskdef resource="${config.dir}/checkstyletask.properties" classpathref="build.class.path" loaderRef="default" /> -->
 
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="build.class.path"
                  loaderRef="default"/>
@@ -166,7 +165,7 @@
     <!-- PMD                                                                 -->
     <!-- =================================================================== -->
     <target name="pmd" depends="prepare">
-        <pmd shortFilenames="true" rulesetfiles="${config.dir}/pmd-ruleset.xml">
+        <pmd shortFilenames="true" rulesetfiles="pmd-ruleset.xml">
             <formatter type="html" toFile="${build.dir}/pmd_report.html"
                        linkPrefix="http://46.137.78.14:8080/job/Eos/javadoc/"/>
             <formatter type="xml" toFile="${build.dir}/pmd.xml"
@@ -197,7 +196,7 @@
         <findbugs home="${build.lib.dir}/findbugs-1.3.9" output="xml" sourcepath="${src.dir}"
                   outputFile="${build.dir}/findbugs.xml"
                   reportLevel="medium"
-                  excludeFilter="${config.dir}/findbug-exclude.xml"
+                  excludeFilter="findbug-exclude.xml"
                   jvmargs="-Xmx512m"
                   timeout="1200000">
 
diff --git a/script/findbug-exclude.xml b/script/findbug-exclude.xml
new file mode 100644
index 0000000..fd1f8ef
--- /dev/null
+++ b/script/findbug-exclude.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : findbug-exclude.xml
+    Created on : April 29, 2009, 11:38 AM
+    Author     : rnentjes
+    Description:
+        Purpose of the document follows.
+-->
+<FindBugsFilter>
+     <Match>
+       <Bug pattern="URF_UNREAD_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="UUF_UNUSED_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP2" />
+     </Match>
+     <Match>
+       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+     </Match>
+     <Match>
+       <Bug pattern="MS_PKGPROTECT" />
+     </Match>
+     <Match>
+       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_NUMBER_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_BOOLEAN_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_NO_SERIALVERSIONID" />
+     </Match>
+     <Match>
+       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+     </Match>     
+     <Match>
+       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_GC" />
+     </Match>
+</FindBugsFilter>
+

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
deleted file mode 100644
index 40ebceb..0000000
--- a/config/pmd-ruleset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<ruleset level="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>
-  This ruleset checks my code for bad stuff
-    </description>
-
-	<!--
-        rulesets/basic.xml,
-        rulesets/braces.xml,
-        rulesets/clone.xml,
-        rulesets/codesize.xml,
-        rulesets/controversial.xml,
-        rulesets/coupling.xml,
-        rulesets/design.xml,
-        rulesets/finalizers.xml,
-        rulesets/imports.xml,
-        rulesets/j2ee.xml,
-        rulesets/javabeans.xml,
-        rulesets/junit.xml,
-        rulesets/logging-jakarta-commons.xml,
-        rulesets/logging-java.xml,
-        rulesets/migrating.xml,
-        rulesets/naming.xml,
-        rulesets/optimizations.xml,
-        rulesets/strictexception.xml,
-        rulesets/strings.xml,
-        rulesets/sunsecure.xml,
-        rulesets/unusedcode.xml
-        -->
-
-    <rule ref="rulesets/basic.xml">
-        <exclude level="CollapsibleIfStatements"/>
-        <exclude level="UselessOverridingMethod"/>
-        <exclude level="AvoidUsingHardCodedIP"/>
-    </rule>
-    <rule ref="rulesets/braces.xml"/>
-    
-    <!--
-    <rule ref="rulesets/controversial.xml">
-        <exclude level="CallSuperInConstructor"/>
-        <exclude level="DataflowAnomalyAnalysis"/>
-        <exclude level="NullAssignment"/>
-        <exclude level="OnlyOneReturn"/>
-    </rule>
-    -->
-
-    <rule ref="rulesets/coupling.xml">
-        <exclude level="ExcessiveImports"/>
-    </rule>
-    
-    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="rulesets/design.xml/CloseResource"/>
-    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
-    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--
-    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
-    -->
-
-    <rule ref="rulesets/finalizers.xml"/>
-    <rule ref="rulesets/imports.xml"/>
-    <rule ref="rulesets/j2ee.xml"/>
-    <rule ref="rulesets/optimizations.xml">
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="UseStringBufferForStringAppends" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-    </rule>
-
-</ruleset>
diff --git a/script/build.xml b/script/build.xml
index 48040ad..acc097d 100644
--- a/script/build.xml
+++ b/script/build.xml
@@ -102,7 +102,6 @@
     <!-- Initialise                                                          -->
     <!-- =================================================================== -->
     <target name="init">
-        <!-- <taskdef resource="${config.dir}/checkstyletask.properties" classpathref="build.class.path" loaderRef="default" /> -->
 
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="build.class.path"
                  loaderRef="default"/>
@@ -166,7 +165,7 @@
     <!-- PMD                                                                 -->
     <!-- =================================================================== -->
     <target name="pmd" depends="prepare">
-        <pmd shortFilenames="true" rulesetfiles="${config.dir}/pmd-ruleset.xml">
+        <pmd shortFilenames="true" rulesetfiles="pmd-ruleset.xml">
             <formatter type="html" toFile="${build.dir}/pmd_report.html"
                        linkPrefix="http://46.137.78.14:8080/job/Eos/javadoc/"/>
             <formatter type="xml" toFile="${build.dir}/pmd.xml"
@@ -197,7 +196,7 @@
         <findbugs home="${build.lib.dir}/findbugs-1.3.9" output="xml" sourcepath="${src.dir}"
                   outputFile="${build.dir}/findbugs.xml"
                   reportLevel="medium"
-                  excludeFilter="${config.dir}/findbug-exclude.xml"
+                  excludeFilter="findbug-exclude.xml"
                   jvmargs="-Xmx512m"
                   timeout="1200000">
 
diff --git a/script/findbug-exclude.xml b/script/findbug-exclude.xml
new file mode 100644
index 0000000..fd1f8ef
--- /dev/null
+++ b/script/findbug-exclude.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : findbug-exclude.xml
+    Created on : April 29, 2009, 11:38 AM
+    Author     : rnentjes
+    Description:
+        Purpose of the document follows.
+-->
+<FindBugsFilter>
+     <Match>
+       <Bug pattern="URF_UNREAD_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="UUF_UNUSED_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP2" />
+     </Match>
+     <Match>
+       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+     </Match>
+     <Match>
+       <Bug pattern="MS_PKGPROTECT" />
+     </Match>
+     <Match>
+       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_NUMBER_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_BOOLEAN_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_NO_SERIALVERSIONID" />
+     </Match>
+     <Match>
+       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+     </Match>     
+     <Match>
+       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_GC" />
+     </Match>
+</FindBugsFilter>
+
diff --git a/script/findbug-include.xml b/script/findbug-include.xml
new file mode 100644
index 0000000..686e759
--- /dev/null
+++ b/script/findbug-include.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : findbug-include.xml
+    Created on : April 29, 2009, 11:38 AM
+    Author     : rnentjes
+    Description:
+        Purpose of the document follows.
+-->
+<FindBugsFilter>
+
+</FindBugsFilter>
+

diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
deleted file mode 100644
index 1b3c0ad..0000000
--- a/config/checkstyle_checks.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-	  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-	  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module level="Checker">
-
-  <metadata level="com.atlas-sw.eclipse" value="I like Sydney"/>
-
-  <property level="severity" value="error"/>
-
-  <module level="SuppressionFilter">
-    <property level="file" value="${checkstyle.suppressions.file}"/>
-  </module>
-
-  <module level="JavadocPackage">
-    <property level="allowLegacy" value="false"/>
-  </module>
-
-  <module level="Translation">
-    <property level="severity" value="${translation.severity}"/>
-  </module>
-
-  <module level="TreeWalker">
-
-    <property level="tabWidth" value="4" />
-
-    <module level="Regexp">
-      <property level="id" value="trailing"/>
-      <property level="format" value="[ \t]+$"/>
-      <property level="illegalPattern" value="true"/>
-      <property level="message" value="trailing whitespace"/>
-    </module>
-
-    <module level="AvoidStarImport"/>
-    <module level="ConstantName"/>
-    <module level="EmptyBlock"/>
-    <module level="EmptyForIteratorPad"/>
-    <module level="EqualsHashCode"/>
-    <module level="FileLength" />
-    <module level="Header">
-      <property level="headerFile" value="${checkstyle.header.file}"/>
-    </module>
-
-    <!-- module level="IllegalCatch"/ -->
-    <module level="ImportControl">
-      <property level="file" value="${checkstyle.importcontrol.file}"/>
-    </module>
-    <module level="IllegalImport"/>
-    <module level="IllegalInstantiation"/>
-    <module level="IllegalThrows"/>
-    <module level="InnerAssignment"/>
-    <module level="JavadocType">
-      <property level="authorFormat" value="\S"/>
-    </module>
-    <module level="JavadocMethod">
-      <property level="allowUndeclaredRTE" value="true"/>
-      <property level="allowThrowsTagsForSubclasses" value="true"/>
-    </module>
-    <module level="JavadocVariable"/>
-    <module level="JavadocStyle">
-      <property level="scope" value="public"/>
-    </module>
-
-    <module level="LeftCurly">
-      <property level="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
-      <property level="option" value="nl"/>
-    </module>
-    <module level="LeftCurly">
-      <property level="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
-      <property level="option" value="nlow"/>
-    </module>
-
-    <module level="LineLength">
-      <property level="ignorePattern" value="^ *\* *[^ ]+$"/>
-    </module>
-
-    <module level="LocalFinalVariableName"/>
-    <module level="LocalVariableName"/>
-    <module level="MemberName">
-      <property level="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="MethodLength"/>
-    <module level="MethodName"/>
-    <module level="MethodParamPad"/>
-    <module level="ModifierOrder"/>
-    <module level="NeedBraces"/>
-    <module level="NoWhitespaceAfter">
-      <property level="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-    </module>
-
-    <module level="NoWhitespaceBefore"/>
-    <module level="NoWhitespaceBefore">
-      <property level="tokens" value="DOT"/>
-      <property level="allowLineBreaks" value="true"/>
-    </module>
-
-    <module level="OperatorWrap"/>
-    <module level="OperatorWrap">
-      <property level="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-      <property level="option" value="eol"/>
-    </module>
-    <module level="PackageName"/>
-    <module level="ParameterName">
-      <property level="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="ParameterNumber">
-      <property level="id" value="paramNum"/>
-    </module>
-    <module level="ParenPad"/>
-    <module level="TypecastParenPad"/>
-    <module level="RedundantImport"/>
-    <module level="RedundantModifier"/>
-    <module level="RightCurly">
-      <property level="option" value="alone"/>
-    </module>
-    <module level="SimplifyBooleanExpression"/>
-    <module level="SimplifyBooleanReturn"/>
-    <module level="StaticVariableName">
-      <property level="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
-    </module>
-    <module level="TabCharacter"/>
-    <module level="TypeName"/>
-    <module level="UnusedImports"/>
-    <module level="UpperEll"/>
-    <module level="VisibilityModifier"/>
-    <module level="WhitespaceAfter"/>
-    <module level="WhitespaceAround"/>
-    <module level="GenericWhitespace"/>
-    <module level="FinalClass"/>
-    <module level="MissingSwitchDefault"/>
-    <module level="MagicNumber"/>
-    <module level="Indentation">
-      <property level="basicOffset" value="4"/>
-      <property level="braceAdjustment" value="0"/>
-      <property level="caseIndent" value="0"/>
-    </module>
-    <module level="ArrayTrailingComma"/>
-    <module level="FinalLocalVariable"/>
-    <module level="EqualsAvoidNull"/>
-
-    <!-- Generates quite a few errors -->
-    <module level="CyclomaticComplexity">
-      <property level="severity" value="ignore"/>
-    </module>
-
-    <module level="NestedIfDepth">
-      <property level="max" value="3"/>
-    </module>
-    <module level="NestedTryDepth"/>
-    <module level="ExplicitInitialization"/>
-  </module>
-</module>
diff --git a/config/checkstyletask.properties b/config/checkstyletask.properties
deleted file mode 100644
index e69de29..0000000
--- a/config/checkstyletask.properties
+++ /dev/null
diff --git a/config/findbug-exclude.xml b/config/findbug-exclude.xml
deleted file mode 100644
index fd1f8ef..0000000
--- a/config/findbug-exclude.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-exclude.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-     <Match>
-       <Bug pattern="URF_UNREAD_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="UUF_UNUSED_FIELD" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP" />
-     </Match>
-     <Match>
-       <Bug pattern="EI_EXPOSE_REP2" />
-     </Match>
-     <Match>
-       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
-     </Match>
-     <Match>
-       <Bug pattern="MS_PKGPROTECT" />
-     </Match>
-     <Match>
-       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_NUMBER_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_BOOLEAN_CTOR" />
-     </Match>
-     <Match>
-       <Bug pattern="SE_NO_SERIALVERSIONID" />
-     </Match>
-     <Match>
-       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
-     </Match>     
-     <Match>
-       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
-     </Match>
-     <Match>
-       <Bug pattern="DM_GC" />
-     </Match>
-</FindBugsFilter>
-
diff --git a/config/findbug-include.xml b/config/findbug-include.xml
deleted file mode 100644
index 686e759..0000000
--- a/config/findbug-include.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : findbug-include.xml
-    Created on : April 29, 2009, 11:38 AM
-    Author     : rnentjes
-    Description:
-        Purpose of the document follows.
--->
-<FindBugsFilter>
-
-</FindBugsFilter>
-
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
deleted file mode 100644
index 40ebceb..0000000
--- a/config/pmd-ruleset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-<ruleset level="Custom ruleset"
-    xmlns="http://pmd.sf.net/ruleset/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
-    <description>
-  This ruleset checks my code for bad stuff
-    </description>
-
-	<!--
-        rulesets/basic.xml,
-        rulesets/braces.xml,
-        rulesets/clone.xml,
-        rulesets/codesize.xml,
-        rulesets/controversial.xml,
-        rulesets/coupling.xml,
-        rulesets/design.xml,
-        rulesets/finalizers.xml,
-        rulesets/imports.xml,
-        rulesets/j2ee.xml,
-        rulesets/javabeans.xml,
-        rulesets/junit.xml,
-        rulesets/logging-jakarta-commons.xml,
-        rulesets/logging-java.xml,
-        rulesets/migrating.xml,
-        rulesets/naming.xml,
-        rulesets/optimizations.xml,
-        rulesets/strictexception.xml,
-        rulesets/strings.xml,
-        rulesets/sunsecure.xml,
-        rulesets/unusedcode.xml
-        -->
-
-    <rule ref="rulesets/basic.xml">
-        <exclude level="CollapsibleIfStatements"/>
-        <exclude level="UselessOverridingMethod"/>
-        <exclude level="AvoidUsingHardCodedIP"/>
-    </rule>
-    <rule ref="rulesets/braces.xml"/>
-    
-    <!--
-    <rule ref="rulesets/controversial.xml">
-        <exclude level="CallSuperInConstructor"/>
-        <exclude level="DataflowAnomalyAnalysis"/>
-        <exclude level="NullAssignment"/>
-        <exclude level="OnlyOneReturn"/>
-    </rule>
-    -->
-
-    <rule ref="rulesets/coupling.xml">
-        <exclude level="ExcessiveImports"/>
-    </rule>
-    
-    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="rulesets/design.xml/CloseResource"/>
-    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
-    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
-    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
-    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="rulesets/design.xml/SimplifyConditional"/>
-    <!--
-    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
-    -->
-
-    <rule ref="rulesets/finalizers.xml"/>
-    <rule ref="rulesets/imports.xml"/>
-    <rule ref="rulesets/j2ee.xml"/>
-    <rule ref="rulesets/optimizations.xml">
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="UseStringBufferForStringAppends" />
-        <exclude level="LocalVariableCouldBeFinal" />
-        <exclude level="MethodArgumentCouldBeFinal" />
-        <exclude level="AvoidInstantiatingObjectsInLoops" />
-    </rule>
-
-</ruleset>
diff --git a/script/build.xml b/script/build.xml
index 48040ad..acc097d 100644
--- a/script/build.xml
+++ b/script/build.xml
@@ -102,7 +102,6 @@
     <!-- Initialise                                                          -->
     <!-- =================================================================== -->
     <target name="init">
-        <!-- <taskdef resource="${config.dir}/checkstyletask.properties" classpathref="build.class.path" loaderRef="default" /> -->
 
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="build.class.path"
                  loaderRef="default"/>
@@ -166,7 +165,7 @@
     <!-- PMD                                                                 -->
     <!-- =================================================================== -->
     <target name="pmd" depends="prepare">
-        <pmd shortFilenames="true" rulesetfiles="${config.dir}/pmd-ruleset.xml">
+        <pmd shortFilenames="true" rulesetfiles="pmd-ruleset.xml">
             <formatter type="html" toFile="${build.dir}/pmd_report.html"
                        linkPrefix="http://46.137.78.14:8080/job/Eos/javadoc/"/>
             <formatter type="xml" toFile="${build.dir}/pmd.xml"
@@ -197,7 +196,7 @@
         <findbugs home="${build.lib.dir}/findbugs-1.3.9" output="xml" sourcepath="${src.dir}"
                   outputFile="${build.dir}/findbugs.xml"
                   reportLevel="medium"
-                  excludeFilter="${config.dir}/findbug-exclude.xml"
+                  excludeFilter="findbug-exclude.xml"
                   jvmargs="-Xmx512m"
                   timeout="1200000">
 
diff --git a/script/findbug-exclude.xml b/script/findbug-exclude.xml
new file mode 100644
index 0000000..fd1f8ef
--- /dev/null
+++ b/script/findbug-exclude.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : findbug-exclude.xml
+    Created on : April 29, 2009, 11:38 AM
+    Author     : rnentjes
+    Description:
+        Purpose of the document follows.
+-->
+<FindBugsFilter>
+     <Match>
+       <Bug pattern="URF_UNREAD_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="UUF_UNUSED_FIELD" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP" />
+     </Match>
+     <Match>
+       <Bug pattern="EI_EXPOSE_REP2" />
+     </Match>
+     <Match>
+       <Bug pattern="DLS_DEAD_LOCAL_STORE" />
+     </Match>
+     <Match>
+       <Bug pattern="MS_PKGPROTECT" />
+     </Match>
+     <Match>
+       <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_NUMBER_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_BOOLEAN_CTOR" />
+     </Match>
+     <Match>
+       <Bug pattern="SE_NO_SERIALVERSIONID" />
+     </Match>
+     <Match>
+       <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+     </Match>     
+     <Match>
+       <Bug pattern="SKIPPED_CLASS_TOO_BIG" />
+     </Match>
+     <Match>
+       <Bug pattern="DM_GC" />
+     </Match>
+</FindBugsFilter>
+
diff --git a/script/findbug-include.xml b/script/findbug-include.xml
new file mode 100644
index 0000000..686e759
--- /dev/null
+++ b/script/findbug-include.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : findbug-include.xml
+    Created on : April 29, 2009, 11:38 AM
+    Author     : rnentjes
+    Description:
+        Purpose of the document follows.
+-->
+<FindBugsFilter>
+
+</FindBugsFilter>
+
diff --git a/script/pmd-ruleset.xml b/script/pmd-ruleset.xml
new file mode 100644
index 0000000..40ebceb
--- /dev/null
+++ b/script/pmd-ruleset.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<ruleset level="Custom ruleset"
+    xmlns="http://pmd.sf.net/ruleset/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+    xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+    <description>
+  This ruleset checks my code for bad stuff
+    </description>
+
+	<!--
+        rulesets/basic.xml,
+        rulesets/braces.xml,
+        rulesets/clone.xml,
+        rulesets/codesize.xml,
+        rulesets/controversial.xml,
+        rulesets/coupling.xml,
+        rulesets/design.xml,
+        rulesets/finalizers.xml,
+        rulesets/imports.xml,
+        rulesets/j2ee.xml,
+        rulesets/javabeans.xml,
+        rulesets/junit.xml,
+        rulesets/logging-jakarta-commons.xml,
+        rulesets/logging-java.xml,
+        rulesets/migrating.xml,
+        rulesets/naming.xml,
+        rulesets/optimizations.xml,
+        rulesets/strictexception.xml,
+        rulesets/strings.xml,
+        rulesets/sunsecure.xml,
+        rulesets/unusedcode.xml
+        -->
+
+    <rule ref="rulesets/basic.xml">
+        <exclude level="CollapsibleIfStatements"/>
+        <exclude level="UselessOverridingMethod"/>
+        <exclude level="AvoidUsingHardCodedIP"/>
+    </rule>
+    <rule ref="rulesets/braces.xml"/>
+    
+    <!--
+    <rule ref="rulesets/controversial.xml">
+        <exclude level="CallSuperInConstructor"/>
+        <exclude level="DataflowAnomalyAnalysis"/>
+        <exclude level="NullAssignment"/>
+        <exclude level="OnlyOneReturn"/>
+    </rule>
+    -->
+
+    <rule ref="rulesets/coupling.xml">
+        <exclude level="ExcessiveImports"/>
+    </rule>
+    
+    <rule ref="rulesets/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
+    <rule ref="rulesets/design.xml/CloseResource"/>
+    <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>
+    <rule ref="rulesets/design.xml/NonStaticInitializer"/>
+    <rule ref="rulesets/design.xml/NonThreadSafeSingleton"/>
+    <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+    <rule ref="rulesets/design.xml/PreserveStackTrace"/>
+    <rule ref="rulesets/design.xml/SimpleDateFormatNeedsLocale"/>
+    <rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>
+    <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+    <rule ref="rulesets/design.xml/SimplifyConditional"/>
+    <!--
+    <rule ref="rulesets/design.xml/UseCollectionIsEmpty"/>
+    -->
+
+    <rule ref="rulesets/finalizers.xml"/>
+    <rule ref="rulesets/imports.xml"/>
+    <rule ref="rulesets/j2ee.xml"/>
+    <rule ref="rulesets/optimizations.xml">
+        <exclude level="AvoidInstantiatingObjectsInLoops" />
+        <exclude level="LocalVariableCouldBeFinal" />
+        <exclude level="MethodArgumentCouldBeFinal" />
+        <exclude level="UseStringBufferForStringAppends" />
+        <exclude level="LocalVariableCouldBeFinal" />
+        <exclude level="MethodArgumentCouldBeFinal" />
+        <exclude level="AvoidInstantiatingObjectsInLoops" />
+    </rule>
+
+</ruleset>