-merging the "service" and "web" projects
-moving the config files around in order to follow the maven directory layout (http://maven.apache.org/guides/introduction/introduction-to-the-standard-directory-layout.html)