Refactor old components into MVVM framework