major cleanup, migration to maven