Refactored Src/Test Folders (Mavenization 1)