diff --git a/pom.xml b/pom.xml
index b6635d4..73a7c60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,12 +25,11 @@
       <timezone>PST</timezone>
     </developer>
   </developers>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
   <build>
-    <finalName>album</finalName>
-    <sourceDirectory>src</sourceDirectory>
-    <resources>
-      <resource><directory>etc</directory></resource>
-    </resources>
+    <finalName>photo</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -40,13 +39,6 @@
           <target>1.5</target>         
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <warSourceDirectory>webapp</warSourceDirectory>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
diff --git a/src/org/forkalsrud/album/db/ThumbnailDatabase.java b/src/main/java/org/forkalsrud/album/db/ThumbnailDatabase.java
similarity index 100%
rename from src/org/forkalsrud/album/db/ThumbnailDatabase.java
rename to src/main/java/org/forkalsrud/album/db/ThumbnailDatabase.java
diff --git a/src/org/forkalsrud/album/editor/Editor.java b/src/main/java/org/forkalsrud/album/editor/Editor.java
similarity index 100%
rename from src/org/forkalsrud/album/editor/Editor.java
rename to src/main/java/org/forkalsrud/album/editor/Editor.java
diff --git a/src/org/forkalsrud/album/editor/Makefile b/src/main/java/org/forkalsrud/album/editor/Makefile
similarity index 100%
rename from src/org/forkalsrud/album/editor/Makefile
rename to src/main/java/org/forkalsrud/album/editor/Makefile
diff --git a/src/org/forkalsrud/album/exif/ComparatorFactory.java b/src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/ComparatorFactory.java
rename to src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
diff --git a/src/org/forkalsrud/album/exif/ComposingComparator.java b/src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/ComposingComparator.java
rename to src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
diff --git a/src/org/forkalsrud/album/exif/Dimension.java b/src/main/java/org/forkalsrud/album/exif/Dimension.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/Dimension.java
rename to src/main/java/org/forkalsrud/album/exif/Dimension.java
diff --git a/src/org/forkalsrud/album/exif/DirectoryEntry.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/DirectoryEntry.java
rename to src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
diff --git a/src/org/forkalsrud/album/exif/Entry.java b/src/main/java/org/forkalsrud/album/exif/Entry.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/Entry.java
rename to src/main/java/org/forkalsrud/album/exif/Entry.java
diff --git a/src/org/forkalsrud/album/exif/FileEntry.java b/src/main/java/org/forkalsrud/album/exif/FileEntry.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/FileEntry.java
rename to src/main/java/org/forkalsrud/album/exif/FileEntry.java
diff --git a/src/org/forkalsrud/album/exif/OggIdentifier.java b/src/main/java/org/forkalsrud/album/exif/OggIdentifier.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/OggIdentifier.java
rename to src/main/java/org/forkalsrud/album/exif/OggIdentifier.java
diff --git a/src/org/forkalsrud/album/exif/Thumbnail.java b/src/main/java/org/forkalsrud/album/exif/Thumbnail.java
similarity index 100%
rename from src/org/forkalsrud/album/exif/Thumbnail.java
rename to src/main/java/org/forkalsrud/album/exif/Thumbnail.java
diff --git a/src/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
similarity index 100%
rename from src/org/forkalsrud/album/web/AlbumServlet.java
rename to src/main/java/org/forkalsrud/album/web/AlbumServlet.java
diff --git a/src/org/forkalsrud/album/web/CachedImage.java b/src/main/java/org/forkalsrud/album/web/CachedImage.java
similarity index 100%
rename from src/org/forkalsrud/album/web/CachedImage.java
rename to src/main/java/org/forkalsrud/album/web/CachedImage.java
diff --git a/src/org/forkalsrud/album/web/PictureScaler.java b/src/main/java/org/forkalsrud/album/web/PictureScaler.java
similarity index 100%
rename from src/org/forkalsrud/album/web/PictureScaler.java
rename to src/main/java/org/forkalsrud/album/web/PictureScaler.java
diff --git a/etc/ehcache-1.5.0.xsd b/src/main/resources/ehcache-1.5.0.xsd
similarity index 100%
rename from etc/ehcache-1.5.0.xsd
rename to src/main/resources/ehcache-1.5.0.xsd
diff --git a/etc/ehcache.xml b/src/main/resources/ehcache.xml
similarity index 100%
rename from etc/ehcache.xml
rename to src/main/resources/ehcache.xml
diff --git a/etc/log4j.properties b/src/main/resources/log4j.properties
similarity index 100%
rename from etc/log4j.properties
rename to src/main/resources/log4j.properties
diff --git a/webapp/.cvsignore b/src/main/webapp/.cvsignore
similarity index 100%
rename from webapp/.cvsignore
rename to src/main/webapp/.cvsignore
diff --git a/webapp/WEB-INF/velocity.properties b/src/main/webapp/WEB-INF/velocity.properties
similarity index 100%
rename from webapp/WEB-INF/velocity.properties
rename to src/main/webapp/WEB-INF/velocity.properties
diff --git a/webapp/WEB-INF/velocity/photo.vm b/src/main/webapp/WEB-INF/velocity/photo.vm
similarity index 100%
rename from webapp/WEB-INF/velocity/photo.vm
rename to src/main/webapp/WEB-INF/velocity/photo.vm
diff --git a/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapp/WEB-INF/web.xml
rename to src/main/webapp/WEB-INF/web.xml
diff --git a/webapp/assets/left-inactive.png b/src/main/webapp/assets/left-inactive.png
similarity index 100%
rename from webapp/assets/left-inactive.png
rename to src/main/webapp/assets/left-inactive.png
diff --git a/webapp/assets/left.png b/src/main/webapp/assets/left.png
similarity index 100%
rename from webapp/assets/left.png
rename to src/main/webapp/assets/left.png
diff --git a/webapp/assets/right-inactive.png b/src/main/webapp/assets/right-inactive.png
similarity index 100%
rename from webapp/assets/right-inactive.png
rename to src/main/webapp/assets/right-inactive.png
diff --git a/webapp/assets/right.png b/src/main/webapp/assets/right.png
similarity index 100%
rename from webapp/assets/right.png
rename to src/main/webapp/assets/right.png
diff --git a/webapp/assets/up-inactive.png b/src/main/webapp/assets/up-inactive.png
similarity index 100%
rename from webapp/assets/up-inactive.png
rename to src/main/webapp/assets/up-inactive.png
diff --git a/webapp/assets/up.png b/src/main/webapp/assets/up.png
similarity index 100%
rename from webapp/assets/up.png
rename to src/main/webapp/assets/up.png
diff --git a/webapp/editor.html b/src/main/webapp/editor.html
similarity index 100%
rename from webapp/editor.html
rename to src/main/webapp/editor.html
diff --git a/webapp/editor.js b/src/main/webapp/editor.js
similarity index 100%
rename from webapp/editor.js
rename to src/main/webapp/editor.js
diff --git a/src/org/forkalsrud/album/exif/OggIdentifierTest.java b/src/test/java/org/forkalsrud/album/exif/OggIdentifierTest.java
similarity index 92%
rename from src/org/forkalsrud/album/exif/OggIdentifierTest.java
rename to src/test/java/org/forkalsrud/album/exif/OggIdentifierTest.java
index f483c55..5ea9cca 100644
--- a/src/org/forkalsrud/album/exif/OggIdentifierTest.java
+++ b/src/test/java/org/forkalsrud/album/exif/OggIdentifierTest.java
@@ -9,7 +9,7 @@ public class OggIdentifierTest {
     @Test
 	public void testVideoIdentifier() throws Exception {
 
-		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("videoheader.ogg"));
+		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("/videoheader.ogg"));
 		Assert.assertNotNull(codec);
 		Assert.assertEquals("video/ogg; codecs=theora", codec.getMimeType());
 	}
@@ -18,7 +18,7 @@ public class OggIdentifierTest {
     @Test
 	public void testAudioIdentifier() throws Exception {
 
-		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("musicheader.ogg"));
+		Codec codec = OggIdentifier.getIdentifier(getClass().getResourceAsStream("/musicheader.ogg"));
 		Assert.assertNotNull(codec);
 		Assert.assertEquals("audio/ogg; codecs=vorbis", codec.getMimeType());
 	}
diff --git a/src/org/forkalsrud/album/exif/musicheader.ogg b/src/test/resources/musicheader.ogg
similarity index 100%
rename from src/org/forkalsrud/album/exif/musicheader.ogg
rename to src/test/resources/musicheader.ogg
diff --git a/src/org/forkalsrud/album/exif/videoheader.ogg b/src/test/resources/videoheader.ogg
similarity index 100%
rename from src/org/forkalsrud/album/exif/videoheader.ogg
rename to src/test/resources/videoheader.ogg