Renamed packages and core Class