Rearranged some classes