general cleanup, move cities and attractions to their own files