Removed redundant java files
Renamed packages
Restructured the porject folders
Renamed test files to be compatible with Maven's default settings