refactoring to AMD + Marionette modules mix