rearranged classes for registration