New architecture: using ember-addon. Refactor.