Refactoring in city demo
Added missing files in demo1