Separate Map and City classes