maven stuff and cleanup/organization
path fix
more fixes to Maven stuff, more cleanup
more fixes to Maven stuff, more cleanup