Added class 7 notes, added stuff for class 8 and rearranged some files