Started to mavenize... more to do