diff --git a/routes/_components/Layout.html b/routes/_components/Layout.html
index 3a9958d..5f2972d 100644
--- a/routes/_components/Layout.html
+++ b/routes/_components/Layout.html
@@ -15,7 +15,7 @@
 {{/if}}
 <script>
 	import Nav from './Nav.html';
-	import VirtualListContainer from './VirtualListContainer.html'
+	import VirtualListContainer from './virtualList/VirtualListContainer.html'
 
 	export default {
 		components: {
diff --git a/routes/_components/Timeline.html b/routes/_components/Timeline.html
index 7f111b5..1219627 100644
--- a/routes/_components/Timeline.html
+++ b/routes/_components/Timeline.html
@@ -21,7 +21,7 @@
   import { getTimeline } from '../_utils/mastodon/timelines'
   import StatusListItem from './StatusListItem.html'
   import LoadingFooter from './LoadingFooter.html'
-  import VirtualList from './VirtualList.html'
+  import VirtualList from './virtualList/VirtualList.html'
   import { splice, push } from 'svelte-extras'
   import { mergeStatuses } from '../_utils/statuses'
   import { mark, stop } from '../_utils/marks'
diff --git a/routes/_components/VirtualList.html b/routes/_components/virtualList/VirtualList.html
similarity index 95%
rename from routes/_components/VirtualList.html
rename to routes/_components/virtualList/VirtualList.html
index 5157253..93233ff 100644
--- a/routes/_components/VirtualList.html
+++ b/routes/_components/virtualList/VirtualList.html
@@ -21,9 +21,9 @@
 <script>
   import VirtualListLazyItem from './VirtualListLazyItem'
   import VirtualListFooter from './VirtualListFooter.html'
-  import { virtualListStore } from '../_utils/virtualListStore'
+  import { virtualListStore } from './virtualListStore'
   import throttle from 'lodash/throttle'
-  import { mark, stop } from '../_utils/marks'
+  import { mark, stop } from '../../_utils/marks'
 
   const DISTANCE_FROM_BOTTOM_TO_FIRE = 400
   const SCROLL_TO_BOTTOM_DELAY = 1000
diff --git a/routes/_components/VirtualListContainer.html b/routes/_components/virtualList/VirtualListContainer.html
similarity index 96%
rename from routes/_components/VirtualListContainer.html
rename to routes/_components/virtualList/VirtualListContainer.html
index fb0e373..cdfd926 100644
--- a/routes/_components/VirtualListContainer.html
+++ b/routes/_components/virtualList/VirtualListContainer.html
@@ -5,11 +5,11 @@
   <slot></slot>
 </div>
 <script>
-  import { virtualListStore } from '../_utils/virtualListStore'
+  import { virtualListStore } from './virtualListStore'
 
   import throttle from 'lodash/throttle'
-  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../_utils/fullscreen'
-  import { mark, stop } from '../_utils/marks'
+  import { isFullscreen, attachFullscreenListener, detachFullscreenListener } from '../../_utils/fullscreen'
+  import { mark, stop } from '../../_utils/marks'
 
   const SCROLL_EVENT_DELAY = 300
 
diff --git a/routes/_components/VirtualListFooter.html b/routes/_components/virtualList/VirtualListFooter.html
similarity index 81%
rename from routes/_components/VirtualListFooter.html
rename to routes/_components/virtualList/VirtualListFooter.html
index e95f18c..c1d8366 100644
--- a/routes/_components/VirtualListFooter.html
+++ b/routes/_components/virtualList/VirtualListFooter.html
@@ -11,8 +11,8 @@
   }
 </style>
 <script>
-  import { virtualListStore } from '../_utils/virtualListStore'
-  import { AsyncLayout } from '../_utils/AsyncLayout'
+  import { virtualListStore } from './virtualListStore'
+  import { AsyncLayout } from '../../_utils/AsyncLayout'
 
   export default {
     oncreate() {
diff --git a/routes/_components/VirtualListItem.html b/routes/_components/virtualList/VirtualListItem.html
similarity index 92%
rename from routes/_components/VirtualListItem.html
rename to routes/_components/virtualList/VirtualListItem.html
index 624c543..bef339a 100644
--- a/routes/_components/VirtualListItem.html
+++ b/routes/_components/virtualList/VirtualListItem.html
@@ -21,8 +21,8 @@
   }
 </style>
 <script>
-  import { virtualListStore } from '../_utils/virtualListStore'
-  import { AsyncLayout } from '../_utils/AsyncLayout'
+  import { virtualListStore } from './virtualListStore'
+  import { AsyncLayout } from '../../_utils/AsyncLayout'
 
   const keyGetter = node => node.getAttribute('virtual-list-key')
   const asyncLayout = new AsyncLayout(keyGetter)
diff --git a/routes/_components/VirtualListLazyItem.html b/routes/_components/virtualList/VirtualListLazyItem.html
similarity index 100%
rename from routes/_components/VirtualListLazyItem.html
rename to routes/_components/virtualList/VirtualListLazyItem.html
diff --git a/routes/_utils/virtualListStore.js b/routes/_components/virtualList/virtualListStore.js
similarity index 98%
rename from routes/_utils/virtualListStore.js
rename to routes/_components/virtualList/virtualListStore.js
index 5ab4a85..5b3270d 100644
--- a/routes/_utils/virtualListStore.js
+++ b/routes/_components/virtualList/virtualListStore.js
@@ -1,5 +1,5 @@
 import { Store } from 'svelte/store.js'
-import { mark, stop } from '../_utils/marks'
+import { mark, stop } from '../../_utils/marks'
 
 const VIEWPORT_RENDER_FACTOR = 4