Refactor: apply feature first design

[krapjost]

This design decision is made for the user can toggle their own features. need code review before merged.