Reorganize for ember-cli compatibility

In-progress updates for Brocfile.js