Renamed packages to fit naming conventions