Crichton refactoring registry 150

@fosdev @jcarres-mdsol Please review and merge. Bunch of tests are still falling. Mostly lint and serializers. Lint is just pain to fix. Serializers need to take a closer look.