Refactored the package and class locations.