diff --git a/src/client/block.ts b/src/client/blocks/block.ts
similarity index 93%
rename from src/client/block.ts
rename to src/client/blocks/block.ts
index 4bf7c609d..05acfd331 100644
--- a/src/client/block.ts
+++ b/src/client/blocks/block.ts
@@ -1,5 +1,5 @@
-import { IBlock } from "./octoTypes"
-import { Utils } from "./utils"
+import { IBlock } from "../octoTypes"
+import { Utils } from "../utils"
 
 class Block implements IBlock {
 	id: string = Utils.createGuid()
diff --git a/src/client/board.ts b/src/client/blocks/board.ts
similarity index 100%
rename from src/client/board.ts
rename to src/client/blocks/board.ts
diff --git a/src/client/boardView.ts b/src/client/blocks/boardView.ts
similarity index 97%
rename from src/client/boardView.ts
rename to src/client/blocks/boardView.ts
index 9b7c8692a..90b7a3b2e 100644
--- a/src/client/boardView.ts
+++ b/src/client/blocks/boardView.ts
@@ -1,5 +1,5 @@
+import { FilterGroup } from "../filterGroup"
 import { Block } from "./block"
-import { FilterGroup } from "./filterGroup"
 
 type IViewType = "board" | "table" | "calendar" | "list" | "gallery"
 type ISortOption = { propertyId: "__name" | string, reversed: boolean }
diff --git a/src/client/card.ts b/src/client/blocks/card.ts
similarity index 100%
rename from src/client/card.ts
rename to src/client/blocks/card.ts
diff --git a/src/client/boardTree.ts b/src/client/boardTree.ts
index 47fedc1bd..3147b81ed 100644
--- a/src/client/boardTree.ts
+++ b/src/client/boardTree.ts
@@ -1,6 +1,6 @@
-import { Board, IPropertyOption, IPropertyTemplate } from "./board"
-import { BoardView } from "./boardView"
-import { Card } from "./card"
+import { Board, IPropertyOption, IPropertyTemplate } from "./blocks/board"
+import { BoardView } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { CardFilter } from "./cardFilter"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"
diff --git a/src/client/cardFilter.ts b/src/client/cardFilter.ts
index 28dd14768..1220f9279 100644
--- a/src/client/cardFilter.ts
+++ b/src/client/cardFilter.ts
@@ -1,5 +1,5 @@
-import { IPropertyTemplate } from "./board"
-import { Card } from "./card"
+import { IPropertyTemplate } from "./blocks/board"
+import { Card } from "./blocks/card"
 import { FilterClause } from "./filterClause"
 import { FilterGroup } from "./filterGroup"
 import { Utils } from "./utils"
diff --git a/src/client/cardTree.ts b/src/client/cardTree.ts
index 92d8b0f12..efc5b2264 100644
--- a/src/client/cardTree.ts
+++ b/src/client/cardTree.ts
@@ -1,4 +1,4 @@
-import { Card } from "./card"
+import { Card } from "./blocks/card"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"
 
diff --git a/src/client/components/boardCard.tsx b/src/client/components/boardCard.tsx
index 4a0177d31..3a076107e 100644
--- a/src/client/components/boardCard.tsx
+++ b/src/client/components/boardCard.tsx
@@ -1,7 +1,7 @@
 import React from "react"
-import { Block } from "../block"
-import { IPropertyTemplate } from "../board"
-import { Card } from "../card"
+import { Block } from "../blocks/block"
+import { IPropertyTemplate } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { Menu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
diff --git a/src/client/components/boardComponent.tsx b/src/client/components/boardComponent.tsx
index 45e3a8c3e..edca4f7ee 100644
--- a/src/client/components/boardComponent.tsx
+++ b/src/client/components/boardComponent.tsx
@@ -1,23 +1,23 @@
 import React from "react"
 import { Archiver } from "../archiver"
 import { BlockIcons } from "../blockIcons"
-import { IPropertyOption } from "../board"
+import { IPropertyOption } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import { CardFilter } from "../cardFilter"
 import ViewMenu from "../components/viewMenu"
-import MenuWrapper from "../widgets/menuWrapper"
-import Menu from "../widgets/menu"
 import { Constants } from "../constants"
 import { Menu as OldMenu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Utils } from "../utils"
+import Menu from "../widgets/menu"
+import MenuWrapper from "../widgets/menuWrapper"
 import { BoardCard } from "./boardCard"
 import { BoardColumn } from "./boardColumn"
 import Button from "./button"
-import { Editable } from "./editable"
 import { CardDialog } from "./cardDialog"
+import { Editable } from "./editable"
 import RootPortal from "./rootPortal"
 
 type Props = {
diff --git a/src/client/components/cardDialog.tsx b/src/client/components/cardDialog.tsx
index 1a7a3c092..05a9b5c2c 100644
--- a/src/client/components/cardDialog.tsx
+++ b/src/client/components/cardDialog.tsx
@@ -1,6 +1,6 @@
 import React from "react"
-import { Block } from "../block"
-import { Card } from "../card"
+import { Block } from "../blocks/block"
+import { Card } from "../blocks/card"
 import { BlockIcons } from "../blockIcons"
 import { BoardTree } from "../boardTree"
 import { CardTree } from "../cardTree"
diff --git a/src/client/components/sidebar.tsx b/src/client/components/sidebar.tsx
index 2b5d491a0..aff47685d 100644
--- a/src/client/components/sidebar.tsx
+++ b/src/client/components/sidebar.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { Archiver } from "../archiver"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
 import { BoardTree } from "../boardTree"
 import Menu from '../widgets/menu'
 import MenuWrapper from '../widgets/menuWrapper'
diff --git a/src/client/components/tableComponent.tsx b/src/client/components/tableComponent.tsx
index 6e2ee502f..1fdad05be 100644
--- a/src/client/components/tableComponent.tsx
+++ b/src/client/components/tableComponent.tsx
@@ -1,23 +1,22 @@
 import React from "react"
 import { Archiver } from "../archiver"
-import { Block } from "../block"
 import { BlockIcons } from "../blockIcons"
-import { IPropertyTemplate } from "../board"
+import { IPropertyTemplate } from "../blocks/board"
+import { Card } from "../blocks/card"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import ViewMenu from "../components/viewMenu"
-import MenuWrapper from "../widgets/menuWrapper"
-import Menu from "../widgets/menu"
 import { CsvExporter } from "../csvExporter"
 import { Menu as OldMenu } from "../menu"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Utils } from "../utils"
+import Menu from "../widgets/menu"
+import MenuWrapper from "../widgets/menuWrapper"
 import Button from "./button"
-import { Editable } from "./editable"
-import { TableRow } from "./tableRow"
 import { CardDialog } from "./cardDialog"
+import { Editable } from "./editable"
 import RootPortal from "./rootPortal"
+import { TableRow } from "./tableRow"
 
 type Props = {
 	boardTree?: BoardTree
diff --git a/src/client/components/tableRow.tsx b/src/client/components/tableRow.tsx
index c594939e5..1194a3bec 100644
--- a/src/client/components/tableRow.tsx
+++ b/src/client/components/tableRow.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
+import { Card } from "../blocks/card"
 import mutator from "../mutator"
 import { OctoUtils } from "../octoUtils"
 import { Editable } from "./editable"
diff --git a/src/client/components/viewMenu.tsx b/src/client/components/viewMenu.tsx
index 620a0f5b6..2d35d3de1 100644
--- a/src/client/components/viewMenu.tsx
+++ b/src/client/components/viewMenu.tsx
@@ -1,7 +1,7 @@
 import React from "react"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
+import { BoardView } from "../blocks/boardView"
 import { BoardTree } from "../boardTree"
-import { BoardView } from "../boardView"
 import mutator from "../mutator"
 import { Utils } from "../utils"
 import Menu from "../widgets/menu"
diff --git a/src/client/components/workspaceComponent.tsx b/src/client/components/workspaceComponent.tsx
index ba9f7e4dd..2d5220df3 100644
--- a/src/client/components/workspaceComponent.tsx
+++ b/src/client/components/workspaceComponent.tsx
@@ -1,6 +1,5 @@
 import React from "react"
 import { BoardTree } from "../boardTree"
-import { Card } from "../card"
 import { Utils } from "../utils"
 import { WorkspaceTree } from "../workspaceTree"
 import { BoardComponent } from "./boardComponent"
diff --git a/src/client/csvExporter.ts b/src/client/csvExporter.ts
index 97060bb18..0dc68d815 100644
--- a/src/client/csvExporter.ts
+++ b/src/client/csvExporter.ts
@@ -1,5 +1,5 @@
+import { BoardView } from "./blocks/boardView"
 import { BoardTree } from "./boardTree"
-import { BoardView } from "./boardView"
 import { OctoUtils } from "./octoUtils"
 import { Utils } from "./utils"
 
diff --git a/src/client/mutator.ts b/src/client/mutator.ts
index 3f61455fd..a1af92f03 100644
--- a/src/client/mutator.ts
+++ b/src/client/mutator.ts
@@ -1,8 +1,8 @@
-import { Block } from "./block"
-import { Board, IPropertyOption, IPropertyTemplate, PropertyType } from "./board"
+import { Block } from "./blocks/block"
+import { Board, IPropertyOption, IPropertyTemplate, PropertyType } from "./blocks/board"
+import { BoardView, ISortOption } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { BoardTree } from "./boardTree"
-import { BoardView, ISortOption } from "./boardView"
-import { Card } from "./card"
 import { FilterGroup } from "./filterGroup"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"
diff --git a/src/client/octoTypes.ts b/src/client/octoTypes.ts
index 02264929a..36892729a 100644
--- a/src/client/octoTypes.ts
+++ b/src/client/octoTypes.ts
@@ -1,5 +1,3 @@
-import { Card } from "./card"
-
 // A block is the fundamental data type
 interface IBlock {
 	id: string
diff --git a/src/client/octoUtils.tsx b/src/client/octoUtils.tsx
index b97f47bab..2d2ccaa00 100644
--- a/src/client/octoUtils.tsx
+++ b/src/client/octoUtils.tsx
@@ -1,8 +1,8 @@
 import React from "react"
-import { IPropertyTemplate } from "./board"
+import { IPropertyTemplate } from "./blocks/board"
+import { ISortOption } from "./blocks/boardView"
+import { Card } from "./blocks/card"
 import { BoardTree } from "./boardTree"
-import { ISortOption } from "./boardView"
-import { Card } from "./card"
 import { Editable } from "./components/editable"
 import { Menu } from "./menu"
 import mutator from "./mutator"
diff --git a/src/client/pages/boardPage.tsx b/src/client/pages/boardPage.tsx
index da9955e08..e6baf4d88 100644
--- a/src/client/pages/boardPage.tsx
+++ b/src/client/pages/boardPage.tsx
@@ -1,15 +1,12 @@
 import React from "react"
 import ReactDOM from "react-dom"
+import { BoardView } from "../blocks/boardView"
 import { BoardTree } from "../boardTree"
-import { BoardView } from "../boardView"
-import { Card } from "../card"
 import { CardTree } from "../cardTree"
-import { CardDialog } from "../components/cardDialog"
 import { FilterComponent } from "../components/filterComponent"
 import { WorkspaceComponent } from "../components/workspaceComponent"
 import { FlashMessage } from "../flashMessage"
 import mutator from "../mutator"
-import octoClient from "../octoClient"
 import { OctoListener } from "../octoListener"
 import { Utils } from "../utils"
 import { WorkspaceTree } from "../workspaceTree"
diff --git a/src/client/pages/homePage.tsx b/src/client/pages/homePage.tsx
index b1177d822..fd8786995 100644
--- a/src/client/pages/homePage.tsx
+++ b/src/client/pages/homePage.tsx
@@ -1,8 +1,7 @@
 import React from 'react'
 import { Archiver } from "../archiver"
-import { Board } from "../board"
+import { Board } from "../blocks/board"
 import Button from '../components/button'
-import mutator from '../mutator'
 import octoClient from "../octoClient"
 import { IBlock } from "../octoTypes"
 import { Utils } from "../utils"
diff --git a/src/client/pages/loginPage.tsx b/src/client/pages/loginPage.tsx
index 4a82cd0c2..85dc49ef1 100644
--- a/src/client/pages/loginPage.tsx
+++ b/src/client/pages/loginPage.tsx
@@ -18,10 +18,10 @@ export default class LoginPage extends React.Component<Props, State> {
     }
 
     handleLogin = () => {
-        console.log("Logging in");
+        console.log("Logging in")
     }
 
-    public render(): React.ReactNode {
+    render(): React.ReactNode {
         return (
             <div className='LoginPage'>
                 <div className='username'>
diff --git a/src/client/propertyMenu.ts b/src/client/propertyMenu.ts
index f666c7731..29f0feb87 100644
--- a/src/client/propertyMenu.ts
+++ b/src/client/propertyMenu.ts
@@ -1,4 +1,4 @@
-import { IPropertyTemplate, PropertyType } from "./board"
+import { IPropertyTemplate, PropertyType } from "./blocks/board"
 import { Menu } from "./menu"
 import { Utils } from "./utils"
 
diff --git a/src/client/workspaceTree.ts b/src/client/workspaceTree.ts
index cc7d221c0..6e70cb898 100644
--- a/src/client/workspaceTree.ts
+++ b/src/client/workspaceTree.ts
@@ -1,4 +1,4 @@
-import { Board } from "./board"
+import { Board } from "./blocks/board"
 import octoClient from "./octoClient"
 import { IBlock } from "./octoTypes"