Some cleanup
added basic router