Refactored Maven and Folder structure