diff --git a/.gitignore b/.gitignore
index a31fb1c..afab74f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@
 /tarballs/
 /generated
 /lib
+cobertura.ser
 
diff --git a/build.xml b/build.xml
index bbd83af..14223a9 100644
--- a/build.xml
+++ b/build.xml
@@ -4,17 +4,18 @@
   <property name="descriptorversion" value="1.1.0-dev" />
   <property name="source-and-target-java-version" value="1.7" />
   <property name="sources" value="src/main/java"/>
-  <property name="resources" value="resources/"/>
+  <property name="resources" value="src/main/resources/"/>
   <property name="generated" value="generated/"/>
   <property name="testresult" value="${generated}/test-results"/>
   <property name="testsources" value="src/test/java"/>
+  <property name="testresources" value="src/test/resources/"/>
   <property name="coverageresult" value="${generated}/coverage-report/"/>
   <property name="instrument" value="${generated}/instrument/"/>
   <property name="classes" value="${generated}/classes/"/>
   <property name="testclasses" value="${generated}/testclasses/"/>
   <property name="docs" value="${generated}/javadoc/"/>
   <property name="libs" value="lib"/>
-  <property name="cobertura.ser.file" value="cobertura.ser" />
+  <property name="cobertura.ser.file" value="${generated}/cobertura.ser" />
   <property name="jarfile" value="collector-${release.version}.jar" />
   <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" />
   <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" />
@@ -70,7 +71,6 @@
     <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="${generated}" defaultexcludes="false" includes="**" />
     </delete>
-    <delete file="${cobertura.ser.file}" quiet="true"/>
     <delete file="${jarfile}" quiet="true"/>
     <delete file="${jarsourcesfile}" quiet="true"/>
     <delete file="${jarjavadocfile}" quiet="true"/>
@@ -154,7 +154,7 @@
     <classpath refid="checkstyle.classpath" />
   </taskdef>
   <target name="checks" depends="compile">
-    <checkstyle config="${resources}/metrics_checks.xml">
+    <checkstyle config="${testresources}/metrics_checks.xml">
       <fileset dir="${sources}"
                includes="**/*.java" />
       <classpath>
diff --git a/web/.htaccess b/src/main/webapp/.htaccess
similarity index 99%
rename from web/.htaccess
rename to src/main/webapp/.htaccess
index 39782d7..0d6bd98 100644
--- a/web/.htaccess
+++ b/src/main/webapp/.htaccess
@@ -4,4 +4,3 @@ IndexOrderDefault Descending Name
 IndexIgnore *.tmp
 HeaderName /header.html
 ReadmeName /footer.html
-
diff --git a/web/css/bootstrap.min.css b/src/main/webapp/css/bootstrap.min.css
similarity index 100%
rename from web/css/bootstrap.min.css
rename to src/main/webapp/css/bootstrap.min.css
diff --git a/web/footer.html b/src/main/webapp/footer.html
similarity index 99%
rename from web/footer.html
rename to src/main/webapp/footer.html
index af6a1b7..f13fbeb 100644
--- a/web/footer.html
+++ b/src/main/webapp/footer.html
@@ -15,4 +15,3 @@
 </div>
 </body>
 </html>
-
diff --git a/web/formats.html b/src/main/webapp/formats.html
similarity index 99%
rename from web/formats.html
rename to src/main/webapp/formats.html
index deb31c1..f2f42d4 100644
--- a/web/formats.html
+++ b/src/main/webapp/formats.html
@@ -21,4 +21,3 @@
     </div><!-- container -->
   </body>
 </html>
-
diff --git a/web/header.html b/src/main/webapp/header.html
similarity index 100%
rename from web/header.html
rename to src/main/webapp/header.html
diff --git a/web/images/collector-logo.png b/src/main/webapp/images/collector-logo.png
similarity index 100%
rename from web/images/collector-logo.png
rename to src/main/webapp/images/collector-logo.png
diff --git a/web/images/collector-wordmark-small.png b/src/main/webapp/images/collector-wordmark-small.png
similarity index 100%
rename from web/images/collector-wordmark-small.png
rename to src/main/webapp/images/collector-wordmark-small.png
diff --git a/web/images/collector-wordmark.png b/src/main/webapp/images/collector-wordmark.png
similarity index 100%
rename from web/images/collector-wordmark.png
rename to src/main/webapp/images/collector-wordmark.png
diff --git a/web/images/favicon.ico b/src/main/webapp/images/favicon.ico
similarity index 100%
rename from web/images/favicon.ico
rename to src/main/webapp/images/favicon.ico
diff --git a/web/index.html b/src/main/webapp/index.html
similarity index 99%
rename from web/index.html
rename to src/main/webapp/index.html
index 84649ac..ccdeea2 100644
--- a/web/index.html
+++ b/src/main/webapp/index.html
@@ -939,4 +939,3 @@ data.
     </div><!-- footer -->
   </body>
 </html>
-
diff --git a/resources/metrics_checks.xml b/src/test/resources/metrics_checks.xml
similarity index 100%
rename from resources/metrics_checks.xml
rename to src/test/resources/metrics_checks.xml