Now ordering by city name instead of city ID
Replaced with new files ordered on a per-city name basis
remove old files
Add stubs for new modules and tests