Renamed packages; refactoring