Core: router moved from router-test.clj to router.clj