Rearranged Class Structure