Fix and reorganize folder for class