diff --git a/src/components/Layout.js b/src/components/Layout.js
index 961d115..6c1ce26 100644
--- a/src/components/Layout.js
+++ b/src/components/Layout.js
@@ -7,7 +7,7 @@ import * as actions from '../actions'
 import MediaOverlay from './Overlay/Media'
 import LoadingOverlay from './Overlay/Loading'
 import Map from './Map.jsx'
-import Toolbar from './Toolbar.jsx'
+import Toolbar from './Toolbar/Layout'
 import CardStack from './CardStack.jsx'
 import NarrativeControls from './presentational/Narrative/Controls.js'
 import InfoPopUp from './InfoPopup.jsx'
diff --git a/src/components/ToolbarBottomActions.js b/src/components/Toolbar/BottomActions.js
similarity index 76%
rename from src/components/ToolbarBottomActions.js
rename to src/components/Toolbar/BottomActions.js
index 8040948..9ccfb8d 100644
--- a/src/components/ToolbarBottomActions.js
+++ b/src/components/Toolbar/BottomActions.js
@@ -1,10 +1,10 @@
 import React from 'react'
 
-import SitesIcon from './presentational/Icons/Sites'
-import CoverIcon from './presentational/Icons/Cover'
-import InfoIcon from './presentational/Icons/Info'
+import SitesIcon from '../presentational/Icons/Sites'
+import CoverIcon from '../presentational/Icons/Cover'
+import InfoIcon from '../presentational/Icons/Info'
 
-function ToolbarBottomActions (props) {
+function BottomActions (props) {
   function renderToggles () {
     return [
       <div className='bottom-action-block'>
@@ -34,4 +34,4 @@ function ToolbarBottomActions (props) {
   )
 }
 
-export default ToolbarBottomActions
+export default BottomActions
diff --git a/src/components/CategoriesListPanel.js b/src/components/Toolbar/CategoriesListPanel.js
similarity index 90%
rename from src/components/CategoriesListPanel.js
rename to src/components/Toolbar/CategoriesListPanel.js
index 3f4a63c..f0c3bf6 100644
--- a/src/components/CategoriesListPanel.js
+++ b/src/components/Toolbar/CategoriesListPanel.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Checkbox from './presentational/Checkbox'
-import copy from '../js/data/copy.json'
+import Checkbox from '../presentational/Checkbox'
+import copy from '../../js/data/copy.json'
 
 export default ({
   categories,
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar/Layout.js
similarity index 95%
rename from src/components/Toolbar.jsx
rename to src/components/Toolbar/Layout.js
index 39a1fc2..1ba407b 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar/Layout.js
@@ -1,16 +1,16 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
-import * as actions from '../actions'
-import * as selectors from '../selectors'
+import * as actions from '../../actions'
+import * as selectors from '../../selectors'
 
 import { Tabs, TabPanel } from 'react-tabs'
-import Search from './Search.jsx'
+import Search from './Search'
 import TagListPanel from './TagListPanel'
 import CategoriesListPanel from './CategoriesListPanel'
-import ToolbarBottomActions from './ToolbarBottomActions'
-import copy from '../js/data/copy.json'
-import { trimAndEllipse } from '../js/utilities.js'
+import BottomActions from './BottomActions'
+import copy from '../../js/data/copy.json'
+import { trimAndEllipse } from '../../js/utilities.js'
 
 class Toolbar extends React.Component {
   constructor (props) {
@@ -164,7 +164,7 @@ class Toolbar extends React.Component {
           {(isCategories) ? this.renderToolbarTab(1, categoriesLabel, 'widgets') : null}
           {(isTags) ? this.renderToolbarTab(2, tagsLabel, 'filter_list') : null}
         </div>
-        <ToolbarBottomActions
+        <BottomActions
           info={{
             enabled: this.props.infoShowing,
             toggle: this.props.actions.toggleInfoPopup
diff --git a/src/components/Search.jsx b/src/components/Toolbar/Search.js
similarity index 97%
rename from src/components/Search.jsx
rename to src/components/Toolbar/Search.js
index d4ed508..1cec565 100644
--- a/src/components/Search.jsx
+++ b/src/components/Toolbar/Search.js
@@ -1,6 +1,6 @@
 /* global fetch */
 import React from 'react'
-import copy from '../js/data/copy.json'
+import copy from '../../js/data/copy.json'
 import TagFilter from './TagFilter'
 
 export default class Search extends React.Component {
diff --git a/src/components/TagFilter.js b/src/components/Toolbar/TagFilter.js
similarity index 97%
rename from src/components/TagFilter.js
rename to src/components/Toolbar/TagFilter.js
index 1e8b4ee..a27f0b0 100644
--- a/src/components/TagFilter.js
+++ b/src/components/Toolbar/TagFilter.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import Checkbox from './presentational/Checkbox'
+import Checkbox from '../presentational/Checkbox'
 
 function TagFilter (props) {
   function isActive () {
diff --git a/src/components/TagListPanel.js b/src/components/Toolbar/TagListPanel.js
similarity index 90%
rename from src/components/TagListPanel.js
rename to src/components/Toolbar/TagListPanel.js
index 0391d31..52d830a 100644
--- a/src/components/TagListPanel.js
+++ b/src/components/Toolbar/TagListPanel.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import Checkbox from './presentational/Checkbox'
-import copy from '../js/data/copy.json'
+import Checkbox from '../presentational/Checkbox'
+import copy from '../../js/data/copy.json'
 
 function TagListPanel ({
   tags,