Finished up modularization of all new registrations.