Fix directory structure for class 2