Refactor features to separate installer