Renamed data package to domain