Disapther moved to its own file; Router refactoring