Removed unused classes
Removed files
Extracted the feature names
Added file