Moved city logic into its own package
Fixed CIty import to use the new city package