12 files changed, 20 insertions, 23 deletions
diff --git a/webui/src/bug/Bug.graphql b/webui/src/bug/Bug.graphql
index 112024aa..498242c0 100644
--- a/webui/src/bug/Bug.graphql
+++ b/webui/src/bug/Bug.graphql
@@ -1,5 +1,4 @@
-#import "../Label.graphql"
-#import "../Author.graphql"
+#import "../components/fragments.graphql"
 
 fragment Bug on Bug {
   id
diff --git a/webui/src/bug/Bug.tsx b/webui/src/bug/Bug.tsx
index 114cb8e0..0e53e447 100644
--- a/webui/src/bug/Bug.tsx
+++ b/webui/src/bug/Bug.tsx
@@ -2,9 +2,9 @@ import Typography from '@material-ui/core/Typography/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
-import Author from '../Author';
-import Date from '../Date';
-import Label from '../Label';
+import Author from '../components/Author';
+import Date from '../components/Date';
+import Label from '../components/Label';
 
 import { BugFragment } from './Bug.generated';
 import CommentForm from './CommentForm';
diff --git a/webui/src/bug/CommentForm.tsx b/webui/src/bug/CommentForm.tsx
index 3aa52b19..a915ecf0 100644
--- a/webui/src/bug/CommentForm.tsx
+++ b/webui/src/bug/CommentForm.tsx
@@ -6,7 +6,7 @@ import TextField from '@material-ui/core/TextField';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 import React, { useState, useRef } from 'react';
 
-import Content from '../Content';
+import Content from '../components/Content';
 
 import { useAddCommentMutation } from './CommentForm.generated';
 import { TimelineDocument } from './TimelineQuery.generated';
diff --git a/webui/src/bug/LabelChange.tsx b/webui/src/bug/LabelChange.tsx
index 572579bd..a3950524 100644
--- a/webui/src/bug/LabelChange.tsx
+++ b/webui/src/bug/LabelChange.tsx
@@ -1,9 +1,9 @@
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
-import Author from '../Author';
-import Date from '../Date';
-import Label from '../Label';
+import Author from '../components/Author';
+import Date from '../components/Date';
+import Label from '../components/Label';
 
 import { LabelChangeFragment } from './LabelChangeFragment.generated';
 
diff --git a/webui/src/bug/LabelChangeFragment.graphql b/webui/src/bug/LabelChangeFragment.graphql
index 631de70c..01b94a98 100644
--- a/webui/src/bug/LabelChangeFragment.graphql
+++ b/webui/src/bug/LabelChangeFragment.graphql
@@ -1,5 +1,4 @@
-#import "../Author.graphql"
-#import "../Label.graphql"
+#import "../components/fragments.graphql"
 
 fragment LabelChange on LabelChangeTimelineItem {
   date
diff --git a/webui/src/bug/Message.tsx b/webui/src/bug/Message.tsx
index c8d0710d..a61ed3f2 100644
--- a/webui/src/bug/Message.tsx
+++ b/webui/src/bug/Message.tsx
@@ -2,10 +2,9 @@ import Paper from '@material-ui/core/Paper';
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
-import Author from '../Author';
-import { Avatar } from '../Author';
-import Content from '../Content';
-import Date from '../Date';
+import Author, { Avatar } from '../components/Author';
+import Date from '../components/Date';
+import Content from '../components/Content';
 
 import { AddCommentFragment } from './MessageCommentFragment.generated';
 import { CreateFragment } from './MessageCreateFragment.generated';
diff --git a/webui/src/bug/MessageCommentFragment.graphql b/webui/src/bug/MessageCommentFragment.graphql
index 38d626d0..61156fee 100644
--- a/webui/src/bug/MessageCommentFragment.graphql
+++ b/webui/src/bug/MessageCommentFragment.graphql
@@ -1,4 +1,4 @@
-#import "../Author.graphql"
+#import "../components/fragments.graphql"
 
 fragment AddComment on AddCommentTimelineItem {
   createdAt
diff --git a/webui/src/bug/MessageCreateFragment.graphql b/webui/src/bug/MessageCreateFragment.graphql
index 08477470..e371b9dc 100644
--- a/webui/src/bug/MessageCreateFragment.graphql
+++ b/webui/src/bug/MessageCreateFragment.graphql
@@ -1,4 +1,4 @@
-#import "../Author.graphql"
+#import "../components/fragments.graphql"
 
 fragment Create on CreateTimelineItem {
   createdAt
diff --git a/webui/src/bug/SetStatus.tsx b/webui/src/bug/SetStatus.tsx
index 3e1a7989..86105c8a 100644
--- a/webui/src/bug/SetStatus.tsx
+++ b/webui/src/bug/SetStatus.tsx
@@ -1,8 +1,8 @@
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
-import Author from '../Author';
-import Date from '../Date';
+import Author from '../components/Author';
+import Date from '../components/Date';
 
 import { SetStatusFragment } from './SetStatusFragment.generated';
 
diff --git a/webui/src/bug/SetStatusFragment.graphql b/webui/src/bug/SetStatusFragment.graphql
index 0fdea01b..5a3986d0 100644
--- a/webui/src/bug/SetStatusFragment.graphql
+++ b/webui/src/bug/SetStatusFragment.graphql
@@ -1,4 +1,4 @@
-#import "../Author.graphql"
+#import "../components/fragments.graphql"
 
 fragment SetStatus on SetStatusTimelineItem {
   date
diff --git a/webui/src/bug/SetTitle.tsx b/webui/src/bug/SetTitle.tsx
index 0b088e0b..e57aaafb 100644
--- a/webui/src/bug/SetTitle.tsx
+++ b/webui/src/bug/SetTitle.tsx
@@ -1,8 +1,8 @@
 import { makeStyles } from '@material-ui/core/styles';
 import React from 'react';
 
-import Author from '../Author';
-import Date from '../Date';
+import Author from '../components/Author';
+import Date from '../components/Date';
 
 import { SetTitleFragment } from './SetTitleFragment.generated';
 
diff --git a/webui/src/bug/SetTitleFragment.graphql b/webui/src/bug/SetTitleFragment.graphql
index 432c4449..22d2185c 100644
--- a/webui/src/bug/SetTitleFragment.graphql
+++ b/webui/src/bug/SetTitleFragment.graphql
@@ -1,4 +1,4 @@
-#import "../Author.graphql"
+#import "../components/fragments.graphql"
 
 fragment SetTitle on SetTitleTimelineItem {
   date