#1010 b switch where plugin registration happens

switches where plugin registrations happens, depends on #1018