Revert "Revert "Refactor registrations controller""

This reverts commit 4f4d1636f22cb73f26f866840731569cd0be0df6.
Fix registrations controller refactoring