Switch to maven
Misc