Reorganised the class files into folders.