Changed FeatureC to CFeature, cleaned up layout, compiled