diff --git a/src/components/atoms/PostActions.jsx b/src/components/Post/PostActions.jsx
similarity index 100%
rename from src/components/atoms/PostActions.jsx
rename to src/components/Post/PostActions.jsx
diff --git a/src/components/atoms/PostActions.module.scss b/src/components/Post/PostActions.module.scss
similarity index 100%
rename from src/components/atoms/PostActions.module.scss
rename to src/components/Post/PostActions.module.scss
diff --git a/src/components/atoms/PostContent.jsx b/src/components/Post/PostContent.jsx
similarity index 100%
rename from src/components/atoms/PostContent.jsx
rename to src/components/Post/PostContent.jsx
diff --git a/src/components/atoms/PostImage.jsx b/src/components/Post/PostImage.jsx
similarity index 94%
rename from src/components/atoms/PostImage.jsx
rename to src/components/Post/PostImage.jsx
index 4232c0d0..682a834e 100644
--- a/src/components/atoms/PostImage.jsx
+++ b/src/components/Post/PostImage.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import Image from './Image'
+import Image from '../atoms/Image'
 import styles from './PostImage.module.scss'
 
 const PostImage = ({ title, fluid, fixed, alt }) => (
diff --git a/src/components/atoms/PostImage.module.scss b/src/components/Post/PostImage.module.scss
similarity index 100%
rename from src/components/atoms/PostImage.module.scss
rename to src/components/Post/PostImage.module.scss
diff --git a/src/components/atoms/PostLead.jsx b/src/components/Post/PostLead.jsx
similarity index 100%
rename from src/components/atoms/PostLead.jsx
rename to src/components/Post/PostLead.jsx
diff --git a/src/components/atoms/PostLead.module.scss b/src/components/Post/PostLead.module.scss
similarity index 100%
rename from src/components/atoms/PostLead.module.scss
rename to src/components/Post/PostLead.module.scss
diff --git a/src/components/atoms/PostLinkActions.jsx b/src/components/Post/PostLinkActions.jsx
similarity index 100%
rename from src/components/atoms/PostLinkActions.jsx
rename to src/components/Post/PostLinkActions.jsx
diff --git a/src/components/atoms/PostLinkActions.module.scss b/src/components/Post/PostLinkActions.module.scss
similarity index 100%
rename from src/components/atoms/PostLinkActions.module.scss
rename to src/components/Post/PostLinkActions.module.scss
diff --git a/src/components/molecules/PostMeta.jsx b/src/components/Post/PostMeta.jsx
similarity index 100%
rename from src/components/molecules/PostMeta.jsx
rename to src/components/Post/PostMeta.jsx
diff --git a/src/components/molecules/PostMeta.module.scss b/src/components/Post/PostMeta.module.scss
similarity index 100%
rename from src/components/molecules/PostMeta.module.scss
rename to src/components/Post/PostMeta.module.scss
diff --git a/src/components/atoms/PostMore.jsx b/src/components/Post/PostMore.jsx
similarity index 100%
rename from src/components/atoms/PostMore.jsx
rename to src/components/Post/PostMore.jsx
diff --git a/src/components/atoms/PostMore.module.scss b/src/components/Post/PostMore.module.scss
similarity index 100%
rename from src/components/atoms/PostMore.module.scss
rename to src/components/Post/PostMore.module.scss
diff --git a/src/components/atoms/PostTitle.jsx b/src/components/Post/PostTitle.jsx
similarity index 100%
rename from src/components/atoms/PostTitle.jsx
rename to src/components/Post/PostTitle.jsx
diff --git a/src/components/atoms/PostTitle.module.scss b/src/components/Post/PostTitle.module.scss
similarity index 100%
rename from src/components/atoms/PostTitle.module.scss
rename to src/components/Post/PostTitle.module.scss
diff --git a/src/components/molecules/Search.jsx b/src/components/Search/Search.jsx
similarity index 92%
rename from src/components/molecules/Search.jsx
rename to src/components/Search/Search.jsx
index 88185b10..6be43e6e 100644
--- a/src/components/molecules/Search.jsx
+++ b/src/components/Search/Search.jsx
@@ -2,9 +2,9 @@ import React, { PureComponent, Fragment } from 'react'
 import PropTypes from 'prop-types'
 import Helmet from 'react-helmet'
 import { CSSTransition } from 'react-transition-group'
-import SearchInput from '../atoms/SearchInput'
-import SearchButton from '../atoms/SearchButton'
-import SearchResults from '../atoms/SearchResults'
+import SearchInput from './SearchInput'
+import SearchButton from './SearchButton'
+import SearchResults from './SearchResults'
 
 import styles from './Search.module.scss'
 
diff --git a/src/components/molecules/Search.module.scss b/src/components/Search/Search.module.scss
similarity index 100%
rename from src/components/molecules/Search.module.scss
rename to src/components/Search/Search.module.scss
diff --git a/src/components/atoms/SearchButton.jsx b/src/components/Search/SearchButton.jsx
similarity index 100%
rename from src/components/atoms/SearchButton.jsx
rename to src/components/Search/SearchButton.jsx
diff --git a/src/components/atoms/SearchButton.module.scss b/src/components/Search/SearchButton.module.scss
similarity index 100%
rename from src/components/atoms/SearchButton.module.scss
rename to src/components/Search/SearchButton.module.scss
diff --git a/src/components/atoms/SearchInput.jsx b/src/components/Search/SearchInput.jsx
similarity index 90%
rename from src/components/atoms/SearchInput.jsx
rename to src/components/Search/SearchInput.jsx
index 654dc90a..72883070 100644
--- a/src/components/atoms/SearchInput.jsx
+++ b/src/components/Search/SearchInput.jsx
@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react'
-import Input from './Input'
+import Input from '../atoms/Input'
 import styles from './SearchInput.module.scss'
 
 const SearchInput = props => (
diff --git a/src/components/atoms/SearchInput.module.scss b/src/components/Search/SearchInput.module.scss
similarity index 100%
rename from src/components/atoms/SearchInput.module.scss
rename to src/components/Search/SearchInput.module.scss
diff --git a/src/components/atoms/SearchResults.jsx b/src/components/Search/SearchResults.jsx
similarity index 100%
rename from src/components/atoms/SearchResults.jsx
rename to src/components/Search/SearchResults.jsx
diff --git a/src/components/atoms/SearchResults.module.scss b/src/components/Search/SearchResults.module.scss
similarity index 100%
rename from src/components/atoms/SearchResults.module.scss
rename to src/components/Search/SearchResults.module.scss
diff --git a/src/components/organisms/Header.jsx b/src/components/organisms/Header.jsx
index b9104bd2..18b76d90 100644
--- a/src/components/organisms/Header.jsx
+++ b/src/components/organisms/Header.jsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react'
 import { Link } from 'gatsby'
 import Container from '../atoms/Container'
-import Search from '../molecules/Search'
+import Search from '../Search/Search'
 import Menu from '../molecules/Menu'
 
 import styles from './Header.module.scss'
diff --git a/src/pages/goodies.jsx b/src/pages/goodies.jsx
index 044a49ff..701c2dff 100644
--- a/src/pages/goodies.jsx
+++ b/src/pages/goodies.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { graphql, Link } from 'gatsby'
-import PostImage from '../components/atoms/PostImage'
+import PostImage from '../components/Post/PostImage'
 import Page from '../templates/Page'
 
 import styles from './goodies.module.scss'
diff --git a/src/templates/Post.jsx b/src/templates/Post.jsx
index e095d2a7..9052d8ac 100644
--- a/src/templates/Post.jsx
+++ b/src/templates/Post.jsx
@@ -3,15 +3,15 @@ import PropTypes from 'prop-types'
 import Helmet from 'react-helmet'
 import { graphql } from 'gatsby'
 import Layout from '../components/Layout'
-import PostImage from '../components/atoms/PostImage'
-import PostTitle from '../components/atoms/PostTitle'
-import PostLead from '../components/atoms/PostLead'
-import PostContent from '../components/atoms/PostContent'
-import PostActions from '../components/atoms/PostActions'
-import PostLinkActions from '../components/atoms/PostLinkActions'
+import PostImage from '../components/Post/PostImage'
+import PostTitle from '../components/Post/PostTitle'
+import PostLead from '../components/Post/PostLead'
+import PostContent from '../components/Post/PostContent'
+import PostActions from '../components/Post/PostActions'
+import PostLinkActions from '../components/Post/PostLinkActions'
 import SEO from '../components/atoms/SEO'
 import Coinhive from '../components/atoms/Coinhive'
-import PostMeta from '../components/molecules/PostMeta'
+import PostMeta from '../components/Post/PostMeta'
 import Exif from '../components/atoms/Exif'
 import RelatedPosts from '../components/molecules/RelatedPosts'
 import styles from './Post.module.scss'
diff --git a/src/templates/Posts.jsx b/src/templates/Posts.jsx
index 722c7a06..41a6837a 100644
--- a/src/templates/Posts.jsx
+++ b/src/templates/Posts.jsx
@@ -2,12 +2,12 @@ import React, { Fragment } from 'react'
 import PropTypes from 'prop-types'
 import { Link, graphql } from 'gatsby'
 import Layout from '../components/Layout'
-import PostImage from '../components/atoms/PostImage'
-import PostTitle from '../components/atoms/PostTitle'
-import PostLead from '../components/atoms/PostLead'
-import PostContent from '../components/atoms/PostContent'
-import PostMore from '../components/atoms/PostMore'
-import PostLinkActions from '../components/atoms/PostLinkActions'
+import PostImage from '../components/Post/PostImage'
+import PostTitle from '../components/Post/PostTitle'
+import PostLead from '../components/Post/PostLead'
+import PostContent from '../components/Post/PostContent'
+import PostMore from '../components/Post/PostMore'
+import PostLinkActions from '../components/Post/PostLinkActions'
 import SEO from '../components/atoms/SEO'
 import Pagination from '../components/molecules/Pagination'
 import Featured from '../components/molecules/Featured'