Registration Controller and other refactoring