Move object and block registration classes in to their own files
Move code common to object and block registrations in to a base class