Flatten back into single class file.