Change to a more mavenized layout