diff --git a/client/components/boards/colors.styl b/client/components/boards/boardColors.styl
similarity index 100%
rename from client/components/boards/colors.styl
rename to client/components/boards/boardColors.styl
diff --git a/client/components/boards/boardList.jade b/client/components/boards/boardsList.jade
similarity index 100%
rename from client/components/boards/boardList.jade
rename to client/components/boards/boardsList.jade
diff --git a/client/components/boards/boardList.js b/client/components/boards/boardsList.js
similarity index 100%
rename from client/components/boards/boardList.js
rename to client/components/boards/boardsList.js
diff --git a/client/components/boards/boardList.styl b/client/components/boards/boardsList.styl
similarity index 100%
rename from client/components/boards/boardList.styl
rename to client/components/boards/boardsList.styl
diff --git a/client/components/cards/details.jade b/client/components/cards/cardDetails.jade
similarity index 100%
rename from client/components/cards/details.jade
rename to client/components/cards/cardDetails.jade
diff --git a/client/components/cards/details.js b/client/components/cards/cardDetails.js
similarity index 100%
rename from client/components/cards/details.js
rename to client/components/cards/cardDetails.js
diff --git a/client/components/cards/details.styl b/client/components/cards/cardDetails.styl
similarity index 100%
rename from client/components/cards/details.styl
rename to client/components/cards/cardDetails.styl
diff --git a/client/components/lists/main.jade b/client/components/lists/list.jade
similarity index 100%
rename from client/components/lists/main.jade
rename to client/components/lists/list.jade
diff --git a/client/components/lists/main.js b/client/components/lists/list.js
similarity index 100%
rename from client/components/lists/main.js
rename to client/components/lists/list.js
diff --git a/client/components/lists/main.styl b/client/components/lists/list.styl
similarity index 100%
rename from client/components/lists/main.styl
rename to client/components/lists/list.styl
diff --git a/client/components/lists/body.jade b/client/components/lists/listBody.jade
similarity index 100%
rename from client/components/lists/body.jade
rename to client/components/lists/listBody.jade
diff --git a/client/components/lists/body.js b/client/components/lists/listBody.js
similarity index 100%
rename from client/components/lists/body.js
rename to client/components/lists/listBody.js
diff --git a/client/components/lists/header.jade b/client/components/lists/listHeader.jade
similarity index 100%
rename from client/components/lists/header.jade
rename to client/components/lists/listHeader.jade
diff --git a/client/components/lists/header.js b/client/components/lists/listHeader.js
similarity index 100%
rename from client/components/lists/header.js
rename to client/components/lists/listHeader.js
diff --git a/client/components/lists/menu.jade b/client/components/lists/listMenu.jade
similarity index 100%
rename from client/components/lists/menu.jade
rename to client/components/lists/listMenu.jade
diff --git a/client/components/lists/menu.js b/client/components/lists/listMenu.js
similarity index 100%
rename from client/components/lists/menu.js
rename to client/components/lists/listMenu.js
diff --git a/client/components/boards/helpers.js b/client/config/blazeHelpers.js
similarity index 50%
rename from client/components/boards/helpers.js
rename to client/config/blazeHelpers.js
index 969f8564e..1be447285 100644
--- a/client/components/boards/helpers.js
+++ b/client/config/blazeHelpers.js
@@ -4,3 +4,10 @@ Blaze.registerHelper('currentBoard', function() {
     return Boards.findOne(boardId);
   }
 });
+
+Blaze.registerHelper('currentCard', function() {
+  var cardId = Session.get('currentCard');
+  if (cardId) {
+    return Cards.findOne(cardId);
+  }
+});
diff --git a/client/config/helpers.js b/client/config/helpers.js
deleted file mode 100644
index 01a28f9b7..000000000
--- a/client/config/helpers.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Blaze.registerHelper('currentCard', function() {
-  var cardId = Session.get('currentCard');
-  if (cardId) {
-    return Cards.findOne(cardId);
-  }
-});