Add class files for feature and cluster