moving to maven straucture