Updates prefixes and Class definitions

Removes smartcity - adds schema and org