Rearrange for maven, add pom