Added first files for city demo
Cleanup in city.py