Refactor Architect controllers