Ember CLI upgrade to 0.0.40 spurred some module refactoring and other tweaks