removes router now in it's own package
fixes and tweaks