Convert controllers and computed property macros to es6 modules