Switched to ember-cli versions of the files