restructure, cleanup and mavenization