diff --git a/react/components/AboutPage/index.js b/react/components/AboutPage/index.jsx
similarity index 100%
rename from react/components/AboutPage/index.js
rename to react/components/AboutPage/index.jsx
diff --git a/react/components/AssetPreview/index.js b/react/components/AssetPreview/index.jsx
similarity index 100%
rename from react/components/AssetPreview/index.js
rename to react/components/AssetPreview/index.jsx
diff --git a/react/components/ErrorPage/index.js b/react/components/ErrorPage/index.jsx
similarity index 100%
rename from react/components/ErrorPage/index.js
rename to react/components/ErrorPage/index.jsx
diff --git a/react/components/FourOhFourPage/index.js b/react/components/FourOhFourPage/index.jsx
similarity index 100%
rename from react/components/FourOhFourPage/index.js
rename to react/components/FourOhFourPage/index.jsx
diff --git a/react/components/GAListener/index.js b/react/components/GAListener/index.jsx
similarity index 100%
rename from react/components/GAListener/index.js
rename to react/components/GAListener/index.jsx
diff --git a/react/components/HomePage/index.js b/react/components/HomePage/index.jsx
similarity index 100%
rename from react/components/HomePage/index.js
rename to react/components/HomePage/index.jsx
diff --git a/react/components/AssetDisplay/index.js b/react/containers/AssetDisplay/index.js
similarity index 100%
rename from react/components/AssetDisplay/index.js
rename to react/containers/AssetDisplay/index.js
diff --git a/react/components/AssetDisplay/view.jsx b/react/containers/AssetDisplay/view.jsx
similarity index 97%
rename from react/components/AssetDisplay/view.jsx
rename to react/containers/AssetDisplay/view.jsx
index 6a8b96e8..0bf77c6d 100644
--- a/react/components/AssetDisplay/view.jsx
+++ b/react/containers/AssetDisplay/view.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import ProgressBar from 'components/ProgressBar';
+import ProgressBar from 'components/ProgressBar/index';
 import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from 'constants/asset_display_states';
 
 class AssetDisplay extends React.Component {
diff --git a/react/components/AssetInfo/index.js b/react/containers/AssetInfo/index.js
similarity index 100%
rename from react/components/AssetInfo/index.js
rename to react/containers/AssetInfo/index.js
diff --git a/react/components/AssetInfo/view.jsx b/react/containers/AssetInfo/view.jsx
similarity index 100%
rename from react/components/AssetInfo/view.jsx
rename to react/containers/AssetInfo/view.jsx
diff --git a/react/components/AssetTitle/index.js b/react/containers/AssetTitle/index.js
similarity index 88%
rename from react/components/AssetTitle/index.js
rename to react/containers/AssetTitle/index.js
index 537d6948..0797513b 100644
--- a/react/components/AssetTitle/index.js
+++ b/react/containers/AssetTitle/index.js
@@ -3,9 +3,7 @@ import View from './view';
 import { selectAsset } from 'selectors/show';
 
 const mapStateToProps = ({ show }) => {
-  // select title
   const { claimData: { title } } = selectAsset(show);
-  //  return props
   return {
     title,
   };
diff --git a/react/components/AssetTitle/view.jsx b/react/containers/AssetTitle/view.jsx
similarity index 100%
rename from react/components/AssetTitle/view.jsx
rename to react/containers/AssetTitle/view.jsx
diff --git a/react/containers/ChannelClaimsDisplay/view.jsx b/react/containers/ChannelClaimsDisplay/view.jsx
index c714a178..742df849 100644
--- a/react/containers/ChannelClaimsDisplay/view.jsx
+++ b/react/containers/ChannelClaimsDisplay/view.jsx
@@ -24,7 +24,7 @@ class ChannelClaimsDisplay extends React.Component {
   render () {
     const { channel: { claimsData: { claims, currentPage, totalPages } } } = this.props;
     return (
-      <div className="row row--tall">
+      <div className='row row--tall'>
         {(claims.length > 0) ? (
           <div>
             {claims.map((claim, index) => <AssetPreview
diff --git a/react/containers/NavBar/view.jsx b/react/containers/NavBar/view.jsx
index 6d62246f..f7339019 100644
--- a/react/containers/NavBar/view.jsx
+++ b/react/containers/NavBar/view.jsx
@@ -54,15 +54,15 @@ class NavBar extends React.Component {
   }
   render () {
     return (
-      <div className="row row--wide nav-bar">
-        <div className="row row--padded row--short flex-container--row flex-container--space-between-center">
+      <div className='row row--wide nav-bar'>
+        <div className='row row--padded row--short flex-container--row flex-container--space-between-center'>
           <Logo />
-          <div className="nav-bar--center">
-            <span className="nav-bar-tagline">Open-source, decentralized image and video sharing.</span>
+          <div className='nav-bar--center'>
+            <span className='nav-bar-tagline'>Open-source, decentralized image and video sharing.</span>
           </div>
-          <div className="nav-bar--right">
-            <NavLink className="nav-bar-link link--nav" activeClassName="link--nav-active" to="/" exact={true}>Publish</NavLink>
-            <NavLink className="nav-bar-link link--nav"  activeClassName="link--nav-active" to="/about">About</NavLink>
+          <div className='nav-bar--right'>
+            <NavLink className='nav-bar-link link--nav' activeClassName='link--nav-active' to='/' exact>Publish</NavLink>
+            <NavLink className='nav-bar-link link--nav'  activeClassName='link--nav-active' to='/about'>About</NavLink>
             { this.props.channelName ? (
               <NavBarChannelDropdown
                 channelName={this.props.channelName}
@@ -72,7 +72,7 @@ class NavBar extends React.Component {
                 LOGOUT={LOGOUT}
               />
             ) : (
-              <NavLink id="nav-bar-login-link" className="nav-bar-link link--nav" activeClassName="link--nav-active" to="/login">Channel</NavLink>
+              <NavLink id='nav-bar-login-link' className='nav-bar-link link--nav' activeClassName='link--nav-active' to='/login'>Channel</NavLink>
             )}
           </div>
         </div>
diff --git a/react/containers/PublishMetadataInputs/view.jsx b/react/containers/PublishMetadataInputs/view.jsx
index 85bcb29e..f5d89dfe 100644
--- a/react/containers/PublishMetadataInputs/view.jsx
+++ b/react/containers/PublishMetadataInputs/view.jsx
@@ -24,48 +24,48 @@ class PublishMetadataInputs extends React.Component {
   }
   render () {
     return (
-      <div id="publish-details" className="row row--padded row--no-top row--wide">
-      {this.props.showMetadataInputs && (
-        <div>
-          <div className="row row--no-top">
-            <div className="column column--3 column--med-10 align-content-top">
-              <label htmlFor="publish-license" className="label">Description:</label>
-            </div><div className="column column--7 column--sml-10">
-              <ExpandingTextArea
-                id="publish-description"
-                className="textarea textarea--primary textarea--full-width"
-                rows={1}
-                maxLength={2000}
-                style={{ maxHeight: 200 }}
-                name="description"
-                placeholder="Optional description"
-                value={this.props.description}
-                onChange={this.handleInput} />
+      <div id='publish-details' className='row row--padded row--no-top row--wide'>
+        {this.props.showMetadataInputs && (
+          <div>
+            <div className='row row--no-top'>
+              <div className='column column--3 column--med-10 align-content-top'>
+                <label htmlFor='publish-license' className='label'>Description:</label>
+              </div><div className='column column--7 column--sml-10'>
+                <ExpandingTextArea
+                  id='publish-description'
+                  className='textarea textarea--primary textarea--full-width'
+                  rows={1}
+                  maxLength={2000}
+                  style={{ maxHeight: 200 }}
+                  name='description'
+                  placeholder='Optional description'
+                  value={this.props.description}
+                  onChange={this.handleInput} />
+              </div>
             </div>
-          </div>
 
-          <div className="row row--no-top">
-            <div className="column column--3 column--med-10">
-              <label htmlFor="publish-license" className="label">License:</label>
-            </div><div className="column column--7 column--sml-10">
-              <select type="text" name="license" id="publish-license" className="select select--primary" onChange={this.handleSelect}>
-                <option value=" ">Unspecified</option>
-                <option value="Public Domain">Public Domain</option>
-                <option value="Creative Commons">Creative Commons</option>
-              </select>
+            <div className='row row--no-top'>
+              <div className='column column--3 column--med-10'>
+                <label htmlFor='publish-license' className='label'>License:</label>
+              </div><div className='column column--7 column--sml-10'>
+                <select type='text' name='license' id='publish-license' className='select select--primary' onChange={this.handleSelect}>
+                  <option value=' '>Unspecified</option>
+                  <option value='Public Domain'>Public Domain</option>
+                  <option value='Creative Commons'>Creative Commons</option>
+                </select>
+              </div>
             </div>
-          </div>
 
-          <div className="row row--no-top">
-            <div className="column column--3">
-              <label htmlFor="publish-nsfw" className="label">Mature:</label>
-            </div><div className="column column--7">
-              <input className="input-checkbox" type="checkbox" id="publish-nsfw" name="nsfw" value={this.props.nsfw} onChange={this.handleInput} />
+            <div className='row row--no-top'>
+              <div className='column column--3'>
+                <label htmlFor='publish-nsfw' className='label'>Mature:</label>
+              </div><div className='column column--7'>
+                <input className='input-checkbox' type='checkbox' id='publish-nsfw' name='nsfw' value={this.props.nsfw} onChange={this.handleInput} />
+              </div>
             </div>
           </div>
-        </div>
-      )}
-        <button className="button--secondary" onClick={this.toggleShowInputs}>{this.props.showMetadataInputs ? 'less' : 'more'}</button>
+        )}
+        <button className='button--secondary' onClick={this.toggleShowInputs}>{this.props.showMetadataInputs ? 'less' : 'more'}</button>
       </div>
     );
   }
diff --git a/react/containers/PublishTitleInput/view.jsx b/react/containers/PublishTitleInput/view.jsx
index b01bc7f2..511fef07 100644
--- a/react/containers/PublishTitleInput/view.jsx
+++ b/react/containers/PublishTitleInput/view.jsx
@@ -12,7 +12,7 @@ class PublishTitleInput extends React.Component {
   }
   render () {
     return (
-      <input type="text" id="publish-title" className="input-text text--large input-text--full-width" name="title" placeholder="Give your post a title..." onChange={this.handleInput} value={this.props.title}/>
+      <input type='text' id='publish-title' className='input-text text--large input-text--full-width' name='title' placeholder='Give your post a title...' onChange={this.handleInput} value={this.props.title} />
     );
   }
 }
diff --git a/react/components/ShowAssetDetails/index.js b/react/containers/ShowAssetDetails/index.js
similarity index 100%
rename from react/components/ShowAssetDetails/index.js
rename to react/containers/ShowAssetDetails/index.js
diff --git a/react/components/ShowAssetDetails/view.jsx b/react/containers/ShowAssetDetails/view.jsx
similarity index 77%
rename from react/components/ShowAssetDetails/view.jsx
rename to react/containers/ShowAssetDetails/view.jsx
index d6cdb2e6..47eafb83 100644
--- a/react/components/ShowAssetDetails/view.jsx
+++ b/react/containers/ShowAssetDetails/view.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import SEO from 'components/SEO';
-import NavBar from 'containers/NavBar';
-import ErrorPage from 'components/ErrorPage';
-import AssetTitle from 'components/AssetTitle';
-import AssetDisplay from 'components/AssetDisplay';
-import AssetInfo from 'components/AssetInfo';
+import SEO from 'components/SEO/index';
+import NavBar from 'containers/NavBar/index';
+import ErrorPage from 'components/ErrorPage/index';
+import AssetTitle from 'containers/AssetTitle/index';
+import AssetDisplay from 'containers/AssetDisplay/index';
+import AssetInfo from 'containers/AssetInfo/index';
 
 class ShowAssetDetails extends React.Component {
   render () {
diff --git a/react/components/ShowAssetLite/index.js b/react/containers/ShowAssetLite/index.js
similarity index 100%
rename from react/components/ShowAssetLite/index.js
rename to react/containers/ShowAssetLite/index.js
diff --git a/react/components/ShowAssetLite/view.jsx b/react/containers/ShowAssetLite/view.jsx
similarity index 89%
rename from react/components/ShowAssetLite/view.jsx
rename to react/containers/ShowAssetLite/view.jsx
index 8241a31b..dbf45feb 100644
--- a/react/components/ShowAssetLite/view.jsx
+++ b/react/containers/ShowAssetLite/view.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import SEO from 'components/SEO';
+import SEO from 'components/SEO/index';
 import { Link } from 'react-router-dom';
-import AssetDisplay from 'components/AssetDisplay';
+import AssetDisplay from 'containers/AssetDisplay/index';
 
 class ShowLite extends React.Component {
   render () {
diff --git a/react/components/ShowChannel/index.js b/react/containers/ShowChannel/index.js
similarity index 100%
rename from react/components/ShowChannel/index.js
rename to react/containers/ShowChannel/index.js
diff --git a/react/components/ShowChannel/view.jsx b/react/containers/ShowChannel/view.jsx
similarity index 86%
rename from react/components/ShowChannel/view.jsx
rename to react/containers/ShowChannel/view.jsx
index 842a6953..64c15062 100644
--- a/react/components/ShowChannel/view.jsx
+++ b/react/containers/ShowChannel/view.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import SEO from 'components/SEO';
-import ErrorPage from 'components/ErrorPage';
-import NavBar from 'containers/NavBar';
-import ChannelClaimsDisplay from 'containers/ChannelClaimsDisplay';
+import SEO from 'components/SEO/index';
+import ErrorPage from 'components/ErrorPage/index';
+import NavBar from 'containers/NavBar/index';
+import ChannelClaimsDisplay from 'containers/ChannelClaimsDisplay/index';
 
 class ShowChannel extends React.Component {
   render () {
diff --git a/react/containers/ShowPage/view.jsx b/react/containers/ShowPage/view.jsx
index 7f275dd9..8e579c02 100644
--- a/react/containers/ShowPage/view.jsx
+++ b/react/containers/ShowPage/view.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import ErrorPage from 'components/ErrorPage';
-import ShowAssetLite from 'components/ShowAssetLite';
-import ShowAssetDetails from 'components/ShowAssetDetails';
-import ShowChannel from 'components/ShowChannel';
+import ShowAssetLite from 'containers/ShowAssetLite';
+import ShowAssetDetails from 'containers/ShowAssetDetails';
+import ShowChannel from 'containers/ShowChannel';
 
 import { CHANNEL, ASSET_LITE, ASSET_DETAILS } from 'constants/show_request_types';