Continue resource factory and controller refactoring