Move city pulldown builder into Pro Pack module.

Clean up supporting code.