better pom.xml, and folder structure to match what maven wants