added city class
Removed city class, added arranged city enum