moving to maven structure