Final Refactoring

Refactored all the Domain paths that were in razor strings (and hence
not caught in the first round)