Rearranged the class files
files rearranged