moving to maven layout
cleanup