refactoring project structure to reflect standard maven locations