diff --git a/app/assets/javascripts/discourse/controllers/flag_action_type_controller.js b/app/assets/javascripts/discourse/controllers/flag-action-type.js.es6
similarity index 95%
rename from app/assets/javascripts/discourse/controllers/flag_action_type_controller.js
rename to app/assets/javascripts/discourse/controllers/flag-action-type.js.es6
index 67347572d9b..c4639cb5a16 100644
--- a/app/assets/javascripts/discourse/controllers/flag_action_type_controller.js
+++ b/app/assets/javascripts/discourse/controllers/flag-action-type.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.FlagActionTypeController = Discourse.ObjectController.extend({
+export default Discourse.ObjectController.extend({
   needs: ['flag'],
 
   message: Em.computed.alias('controllers.flag.message'),
diff --git a/app/assets/javascripts/discourse/controllers/flag_controller.js b/app/assets/javascripts/discourse/controllers/flag.js.es6
similarity index 97%
rename from app/assets/javascripts/discourse/controllers/flag_controller.js
rename to app/assets/javascripts/discourse/controllers/flag.js.es6
index a842d4be2bb..e7e70455a43 100644
--- a/app/assets/javascripts/discourse/controllers/flag_controller.js
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -7,7 +7,7 @@
   @uses Discourse.ModalFunctionality
   @module Discourse
 **/
-Discourse.FlagController = Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
+export default Discourse.ObjectController.extend(Discourse.ModalFunctionality, {
 
   onShow: function() {
     this.set('selected', null);
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
new file mode 100644
index 00000000000..5e3da4c8435
--- /dev/null
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -0,0 +1,36 @@
+/**
+  The modal for when the user has forgotten their password
+
+  @class ForgotPasswordController
+  @extends Discourse.Controller
+  @namespace Discourse
+  @uses Discourse.ModalFunctionality
+  @module Discourse
+**/
+export default Discourse.Controller.extend(Discourse.ModalFunctionality, {
+
+  // You need a value in the field to submit it.
+  submitDisabled: function() {
+    return this.blank('accountEmailOrUsername');
+  }.property('accountEmailOrUsername'),
+
+  actions: {
+    submit: function() {
+      if (!this.get('accountEmailOrUsername')) return false;
+
+      Discourse.ajax("/session/forgot_password", {
+        data: { login: this.get('accountEmailOrUsername') },
+        type: 'POST'
+      });
+
+      // don't tell people what happened, this keeps it more secure (ensure same on server)
+      if (this.get('accountEmailOrUsername').match(/@/)) {
+        this.flash(I18n.t('forgot_password.complete_email', {email: this.get('accountEmailOrUsername')}));
+      } else {
+        this.flash(I18n.t('forgot_password.complete_username', {username: this.get('accountEmailOrUsername')}));
+      }
+      return false;
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/discourse/controllers/forgot_password_controller.js b/app/assets/javascripts/discourse/controllers/forgot_password_controller.js
deleted file mode 100644
index fd16ae467aa..00000000000
--- a/app/assets/javascripts/discourse/controllers/forgot_password_controller.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-  The modal for when the user has forgotten their password
-
-  @class ForgotPasswordController
-  @extends Discourse.Controller
-  @namespace Discourse
-  @uses Discourse.ModalFunctionality
-  @module Discourse
-**/
-Discourse.ForgotPasswordController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
-
-  // You need a value in the field to submit it.
-  submitDisabled: function() {
-    return this.blank('accountEmailOrUsername');
-  }.property('accountEmailOrUsername'),
-
-  submit: function() {
-    if (!this.get('accountEmailOrUsername')) return false;
-
-    Discourse.ajax("/session/forgot_password", {
-      data: { login: this.get('accountEmailOrUsername') },
-      type: 'POST'
-    });
-
-    // don't tell people what happened, this keeps it more secure (ensure same on server)
-    if (this.get('accountEmailOrUsername').match(/@/)) {
-      this.flash(I18n.t('forgot_password.complete_email', {email: this.get('accountEmailOrUsername')}));
-    } else {
-      this.flash(I18n.t('forgot_password.complete_username', {username: this.get('accountEmailOrUsername')}));
-    }
-    return false;
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/controllers/group_controller.js b/app/assets/javascripts/discourse/controllers/group.js.es6
similarity index 86%
rename from app/assets/javascripts/discourse/controllers/group_controller.js
rename to app/assets/javascripts/discourse/controllers/group.js.es6
index 2d7b0ff7df1..57de966961b 100644
--- a/app/assets/javascripts/discourse/controllers/group_controller.js
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.GroupController = Discourse.ObjectController.extend({
+export default Discourse.ObjectController.extend({
   counts: null,
 
   // It would be nice if bootstrap marked action lists as selected when their links
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
index ca97b634f1f..41d3dd0778e 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/flag.js.handlebars
@@ -1,7 +1,7 @@
 <div class="modal-body flag-modal">
 
   <form>
-    {{#each flagsAvailable itemController="flagActionType"}}
+    {{#each flagsAvailable itemController="flag-action-type"}}
       <div class='controls'>
         <label class='radio'>
           <input type='radio' id="radio_{{unbound name_key}}" {{action changePostActionType this}} name='post_action_type_index'> <strong>{{formattedName}}</strong>
diff --git a/test/javascripts/controllers/flag_controller_test.js b/test/javascripts/controllers/flag_controller_test.js
index 57840c56770..505e812df3d 100644
--- a/test/javascripts/controllers/flag_controller_test.js
+++ b/test/javascripts/controllers/flag_controller_test.js
@@ -13,10 +13,10 @@ var buildAdminUser = function(args) {
   }, args || {}));
 };
 
-module("Discourse.FlagController canDeleteSpammer");
+module("controller:flag canDeleteSpammer");
 
 test("canDeleteSpammer not staff", function(){
-  var flagController = testController(Discourse.FlagController, buildPost());
+  var flagController = controllerFor('flag', buildPost()); 
   this.stub(Discourse.User, 'currentProp').withArgs('staff').returns(false);
   flagController.set('selected', Discourse.PostActionType.create({name_key: 'spam'}));
   equal(flagController.get('canDeleteSpammer'), false, 'false if current user is not staff');
@@ -29,7 +29,7 @@ var canDeleteSpammer = function(test, postActionType, expected, testName) {
 
 test("canDeleteSpammer spam not selected", function(){
   this.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
-  this.flagController = testController(Discourse.FlagController, buildPost());
+  this.flagController = controllerFor('flag', buildPost());
   this.flagController.set('userDetails', buildAdminUser({can_delete_all_posts: true, can_be_deleted: true}));
   canDeleteSpammer(this, 'off_topic', false, 'false if current user is staff, but selected is off_topic');
   canDeleteSpammer(this, 'inappropriate', false, 'false if current user is staff, but selected is inappropriate');
@@ -39,7 +39,7 @@ test("canDeleteSpammer spam not selected", function(){
 
 test("canDeleteSpammer spam selected", function(){
   this.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
-  this.flagController = testController(Discourse.FlagController, buildPost());
+  this.flagController = controllerFor('flag', buildPost());
 
   this.flagController.set('userDetails', buildAdminUser({can_delete_all_posts: true, can_be_deleted: true}));
   canDeleteSpammer(this, 'spam', true, 'true if current user is staff, selected is spam, posts and user can be deleted');