Refactor/remove mvc namespace