Move Registration to the same package as Registry