Moved classes into new routing module, deleted util
fix up some comments