restructured class files