Created the various cityBuilders and removed functionality from the CityBuilder class.
Removing CityBuilder later.
Changed some tests because they failed now that the CityBuilders are true SingleTons.