Moved everything into CitySim namespace