mvn module structure refactor