Rearranged classes
re-arranged