Reorganize for ember-cli compatibility