Some refactoring of routing
Add test modules