Refactoring directory structure for maven