updated routing, refactored dependencies