Mavenize (Take 2)
To build use "mvn clean package"
Re-add everything