Refactored files to pull getcities logic out of server