moving registration and events back under to one section

Signed-off-by: Daniel Newns <dan@higgsdesign.com>