misc cleanup
Start of implementing controllers
Start of routing