diff --git a/src/JournalAddressBook.tsx b/src/Journal/JournalAddressBook.tsx
similarity index 85%
rename from src/JournalAddressBook.tsx
rename to src/Journal/JournalAddressBook.tsx
index f2a10c0..2dee19f 100644
--- a/src/JournalAddressBook.tsx
+++ b/src/Journal/JournalAddressBook.tsx
@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { Route, Switch, withRouter } from 'react-router';
 
-import * as EteSync from './api/EteSync';
+import * as EteSync from '../api/EteSync';
 
-import { routeResolver } from './App';
+import { routeResolver } from '../App';
 
-import AddressBook from './components/AddressBook';
-import Contact from './components/Contact';
+import AddressBook from '../components/AddressBook';
+import Contact from '../components/Contact';
 
-import { ContactType } from './pim-types';
+import { ContactType } from '../pim-types';
 
 function objValues(obj: any) {
   return Object.keys(obj).map((x) => obj[x]);
diff --git a/src/JournalCalendar.tsx b/src/Journal/JournalCalendar.tsx
similarity index 82%
rename from src/JournalCalendar.tsx
rename to src/Journal/JournalCalendar.tsx
index 0ccaafb..1941427 100644
--- a/src/JournalCalendar.tsx
+++ b/src/Journal/JournalCalendar.tsx
@@ -1,16 +1,16 @@
 import * as React from 'react';
 import { Route, Switch, withRouter } from 'react-router';
 
-import { routeResolver } from './App';
+import { routeResolver } from '../App';
 
-import { historyPersistor } from './persist-state-history';
+import { historyPersistor } from '../persist-state-history';
 
-import Calendar from './components/Calendar';
-import Event from './components/Event';
+import Calendar from '../components/Calendar';
+import Event from '../components/Event';
 
-import { EventType } from './pim-types';
+import { EventType } from '../pim-types';
 
-import * as EteSync from './api/EteSync';
+import * as EteSync from '../api/EteSync';
 
 function objValues(obj: any) {
   return Object.keys(obj).map((x) => obj[x]);
diff --git a/src/Journal.tsx b/src/Journal/index.tsx
similarity index 89%
rename from src/Journal.tsx
rename to src/Journal/index.tsx
index 65d7d95..e44a409 100644
--- a/src/Journal.tsx
+++ b/src/Journal/index.tsx
@@ -1,17 +1,17 @@
 import * as React from 'react';
 import { Tabs, Tab } from 'material-ui/Tabs';
 
-import Container from './widgets/Container';
+import Container from '../widgets/Container';
 
-import SecondaryHeader from './components/SecondaryHeader';
+import SecondaryHeader from '../components/SecondaryHeader';
 
-import JournalEntries from './components/JournalEntries';
+import JournalEntries from '../components/JournalEntries';
 import JournalAddressBook from './JournalAddressBook';
 import JournalCalendar from './JournalCalendar';
 
-import { syncEntriesToItemMap, syncEntriesToCalendarItemMap } from './journal-processors';
+import { syncEntriesToItemMap, syncEntriesToCalendarItemMap } from '../journal-processors';
 
-import { SyncInfo } from './SyncGate';
+import { SyncInfo } from '../SyncGate';
 
 interface PropsType {
   syncInfo: SyncInfo;