Revert "Move City files to oc"

This reverts commit 0d3b631aa63ab6e10b404abd77edb7e8e8cdc4e1.

Conflicts: