1) Refactoring - moved feature-related operations to separate entities
2) Naming fixes
3) Updated tests