switched to maven modules