refactoring project structure and maven build order