Re-structure registrations