Remove unused templates
Move things around a bit
Move things around a bit
Registration works, I think