Route refactoring, new directives and other cleanup
Working on additional migrations