diff --git a/web/components/create-fold-button.tsx b/web/components/folds/create-fold-button.tsx
similarity index 88%
rename from web/components/create-fold-button.tsx
rename to web/components/folds/create-fold-button.tsx
index 2f1289c4..bc3151e2 100644
--- a/web/components/create-fold-button.tsx
+++ b/web/components/folds/create-fold-button.tsx
@@ -2,15 +2,15 @@ import clsx from 'clsx'
 import { useRouter } from 'next/router'
 import { useState } from 'react'
 import { PlusCircleIcon } from '@heroicons/react/solid'
-import { parseWordsAsTags } from '../../common/util/parse'
-import { createFold } from '../lib/firebase/api-call'
-import { foldPath } from '../lib/firebase/folds'
-import { toCamelCase } from '../../common/util/format'
-import { ConfirmationButton } from './confirmation-button'
-import { Col } from './layout/col'
-import { Spacer } from './layout/spacer'
-import { TagsList } from './tags-list'
-import { Title } from './title'
+import { parseWordsAsTags } from '../../../common/util/parse'
+import { createFold } from '../../lib/firebase/api-call'
+import { foldPath } from '../../lib/firebase/folds'
+import { toCamelCase } from '../../../common/util/format'
+import { ConfirmationButton } from '../confirmation-button'
+import { Col } from '../layout/col'
+import { Spacer } from '../layout/spacer'
+import { TagsList } from '../tags-list'
+import { Title } from '../title'
 
 export function CreateFoldButton() {
   const [name, setName] = useState('')
diff --git a/web/components/edit-fold-button.tsx b/web/components/folds/edit-fold-button.tsx
similarity index 92%
rename from web/components/edit-fold-button.tsx
rename to web/components/folds/edit-fold-button.tsx
index bc4805c2..d18ab41c 100644
--- a/web/components/edit-fold-button.tsx
+++ b/web/components/folds/edit-fold-button.tsx
@@ -3,12 +3,12 @@ import _ from 'lodash'
 import clsx from 'clsx'
 import { PencilIcon } from '@heroicons/react/outline'
 
-import { Fold } from '../../common/fold'
-import { parseWordsAsTags } from '../../common/util/parse'
-import { deleteFold, updateFold } from '../lib/firebase/folds'
-import { toCamelCase } from '../../common/util/format'
-import { Spacer } from './layout/spacer'
-import { TagsList } from './tags-list'
+import { Fold } from '../../../common/fold'
+import { parseWordsAsTags } from '../../../common/util/parse'
+import { deleteFold, updateFold } from '../../lib/firebase/folds'
+import { toCamelCase } from '../../../common/util/format'
+import { Spacer } from '../layout/spacer'
+import { TagsList } from '../tags-list'
 import { useRouter } from 'next/router'
 
 export function EditFoldButton(props: { fold: Fold; className?: string }) {
diff --git a/web/components/fast-fold-following.tsx b/web/components/folds/fast-fold-following.tsx
similarity index 92%
rename from web/components/fast-fold-following.tsx
rename to web/components/folds/fast-fold-following.tsx
index 7a296464..eea1e592 100644
--- a/web/components/fast-fold-following.tsx
+++ b/web/components/folds/fast-fold-following.tsx
@@ -2,10 +2,13 @@ import clsx from 'clsx'
 import { useState } from 'react'
 import { SearchIcon } from '@heroicons/react/outline'
 
-import { User } from '../../common/user'
-import { followFoldFromSlug, unfollowFoldFromSlug } from '../lib/firebase/folds'
-import { Row } from './layout/row'
-import { Spacer } from './layout/spacer'
+import { User } from '../../../common/user'
+import {
+  followFoldFromSlug,
+  unfollowFoldFromSlug,
+} from '../../lib/firebase/folds'
+import { Row } from '../layout/row'
+import { Spacer } from '../layout/spacer'
 
 function FollowFoldButton(props: {
   fold: { slug: string; name: string }
diff --git a/web/components/fold-tag.tsx b/web/components/folds/fold-tag.tsx
similarity index 88%
rename from web/components/fold-tag.tsx
rename to web/components/folds/fold-tag.tsx
index bc3999e5..370cd0b8 100644
--- a/web/components/fold-tag.tsx
+++ b/web/components/folds/fold-tag.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx'
-import { Fold } from '../../common/fold'
+import { Fold } from '../../../common/fold'
 
 export function FoldTag(props: { fold: Fold }) {
   const { fold } = props
diff --git a/web/components/follow-fold-button.tsx b/web/components/folds/follow-fold-button.tsx
similarity index 81%
rename from web/components/follow-fold-button.tsx
rename to web/components/folds/follow-fold-button.tsx
index 6649aad8..03234671 100644
--- a/web/components/follow-fold-button.tsx
+++ b/web/components/folds/follow-fold-button.tsx
@@ -1,8 +1,8 @@
 import clsx from 'clsx'
-import { Fold } from '../../common/fold'
-import { useFollowedFolds } from '../hooks/use-fold'
-import { useUser } from '../hooks/use-user'
-import { followFold, unfollowFold } from '../lib/firebase/folds'
+import { Fold } from '../../../common/fold'
+import { useFollowedFolds } from '../../hooks/use-fold'
+import { useUser } from '../../hooks/use-user'
+import { followFold, unfollowFold } from '../../lib/firebase/folds'
 
 export function FollowFoldButton(props: { fold: Fold; className?: string }) {
   const { fold, className } = props
diff --git a/web/pages/fold/[...slugs]/index.tsx b/web/pages/fold/[...slugs]/index.tsx
index fb39b326..0135d273 100644
--- a/web/pages/fold/[...slugs]/index.tsx
+++ b/web/pages/fold/[...slugs]/index.tsx
@@ -28,9 +28,9 @@ import clsx from 'clsx'
 import { scoreCreators, scoreTraders } from '../../../../common/scoring'
 import { Leaderboard } from '../../../components/leaderboard'
 import { formatMoney, toCamelCase } from '../../../../common/util/format'
-import { EditFoldButton } from '../../../components/edit-fold-button'
+import { EditFoldButton } from '../../../components/folds/edit-fold-button'
 import Custom404 from '../../404'
-import { FollowFoldButton } from '../../../components/follow-fold-button'
+import { FollowFoldButton } from '../../../components/folds/follow-fold-button'
 import FeedCreate from '../../../components/feed-create'
 import { SEO } from '../../../components/SEO'
 import { useTaggedContracts } from '../../../hooks/use-contracts'
diff --git a/web/pages/folds.tsx b/web/pages/folds.tsx
index a47e0d6e..0390b006 100644
--- a/web/pages/folds.tsx
+++ b/web/pages/folds.tsx
@@ -2,8 +2,8 @@ import _ from 'lodash'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
 import { Fold } from '../../common/fold'
-import { CreateFoldButton } from '../components/create-fold-button'
-import { FollowFoldButton } from '../components/follow-fold-button'
+import { CreateFoldButton } from '../components/folds/create-fold-button'
+import { FollowFoldButton } from '../components/folds/follow-fold-button'
 import { Col } from '../components/layout/col'
 import { Row } from '../components/layout/row'
 import { Page } from '../components/page'
diff --git a/web/pages/home.tsx b/web/pages/home.tsx
index 7cf2126a..ee2e72e2 100644
--- a/web/pages/home.tsx
+++ b/web/pages/home.tsx
@@ -18,7 +18,7 @@ import { useUser } from '../hooks/use-user'
 import { Fold } from '../../common/fold'
 import { LoadingIndicator } from '../components/loading-indicator'
 import { Row } from '../components/layout/row'
-import { FastFoldFollowing } from '../components/fast-fold-following'
+import { FastFoldFollowing } from '../components/folds/fast-fold-following'
 import {
   getAllContractInfo,
   useExploreContracts,