diff --git a/app/assets/javascripts/user/app/templates/menu_item_active_list.emblem b/app/assets/javascripts/user/app/templates/menu/active_list.emblem
similarity index 100%
rename from app/assets/javascripts/user/app/templates/menu_item_active_list.emblem
rename to app/assets/javascripts/user/app/templates/menu/active_list.emblem
diff --git a/app/assets/javascripts/user/app/templates/menu_item_list_needs_help.emblem b/app/assets/javascripts/user/app/templates/menu/list_needs_help.emblem
similarity index 100%
rename from app/assets/javascripts/user/app/templates/menu_item_list_needs_help.emblem
rename to app/assets/javascripts/user/app/templates/menu/list_needs_help.emblem
diff --git a/app/assets/javascripts/user/app/templates/menu_item_table.emblem b/app/assets/javascripts/user/app/templates/menu/table.emblem
similarity index 100%
rename from app/assets/javascripts/user/app/templates/menu_item_table.emblem
rename to app/assets/javascripts/user/app/templates/menu/table.emblem
diff --git a/app/assets/javascripts/user/app/views/menu_item_list_needs_help_view.js.coffee b/app/assets/javascripts/user/app/views/menu_item_list_needs_help_view.js.coffee
index bb0e2204..d6e3cf27 100644
--- a/app/assets/javascripts/user/app/views/menu_item_list_needs_help_view.js.coffee
+++ b/app/assets/javascripts/user/app/views/menu_item_list_needs_help_view.js.coffee
@@ -1,6 +1,6 @@
 App.MenuItemListNeedsHelpView = Ember.View.extend Ember.ViewTargetActionSupport,
   action: 'listNeedsHelp'
-  templateName: "menu_item_list_needs_help"
+  templateName: "menu/list_needs_help"
   classNames: 'menu-list-item callout'
   classNameBindings: ['controller.list.needs_help:active']
   click: ->
diff --git a/app/assets/javascripts/user/app/views/menu_item_view.js.coffee b/app/assets/javascripts/user/app/views/menu_item_view.js.coffee
index c94b4a9a..228bbe58 100644
--- a/app/assets/javascripts/user/app/views/menu_item_view.js.coffee
+++ b/app/assets/javascripts/user/app/views/menu_item_view.js.coffee
@@ -10,6 +10,5 @@ App.MenuItemView = Ember.View.extend
     if @get('controller.currentPath') == @route then 'active' else ''
   ).property('controller.currentPath')
   init: ->
-    @templateName = "menu_item_#{@route}"
+    @templateName = "menu/#{@route}"
     @_super()
-