diff --git a/src/App.tsx b/src/App.tsx
index 2e2c0c0..da74997 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -21,7 +21,7 @@ import NavigationMenu from 'material-ui/svg-icons/navigation/menu';
 
 import './App.css';
 
-import { EteSyncContext } from './EteSyncContext';
+import EteSyncContext from './EteSyncContext';
 import { RouteResolver } from './routes';
 
 import * as C from './Constants';
diff --git a/src/EteSyncContext.tsx b/src/EteSyncContext.tsx
index a0ed1eb..2aee79f 100644
--- a/src/EteSyncContext.tsx
+++ b/src/EteSyncContext.tsx
@@ -6,8 +6,8 @@ import RaisedButton from 'material-ui/RaisedButton';
 import TextField from 'material-ui/TextField';
 import Toggle from 'material-ui/Toggle';
 
-import { JournalList } from './JournalList';
-import { JournalView } from './JournalView';
+import JournalList from './JournalList';
+import JournalView from './JournalView';
 
 import * as EteSync from './api/EteSync';
 
@@ -55,7 +55,7 @@ function fetchCredentials(username: string, password: string, encryptionPassword
     };
 }
 
-export class EteSyncContextInner extends React.Component {
+class EteSyncContext extends React.Component {
   state: {
     showAdvanced?: boolean;
     errors: FormErrors;
@@ -253,6 +253,6 @@ const mapStateToProps = (state: store.StoreState) => {
   };
 };
 
-export const EteSyncContext = withRouter(connect(
+export default withRouter(connect(
   mapStateToProps
-)(EteSyncContextInner));
+)(EteSyncContext));
diff --git a/src/JournalList.tsx b/src/JournalList.tsx
index 6fbaf40..0ee5a5c 100644
--- a/src/JournalList.tsx
+++ b/src/JournalList.tsx
@@ -39,7 +39,7 @@ function fetchJournals(etesync: EteSyncContextType) {
   };
 }
 
-class JournalListInner extends React.Component {
+class JournalList extends React.Component {
   props: PropsTypeInner;
 
   constructor(props: any) {
@@ -114,6 +114,6 @@ const mapStateToProps = (state: store.StoreState, props: PropsType) => {
   };
 };
 
-export const JournalList = withRouter(connect(
+export default withRouter(connect(
   mapStateToProps
-)(JournalListInner));
+)(JournalList));
diff --git a/src/JournalView.tsx b/src/JournalView.tsx
index 1465e47..4962147 100644
--- a/src/JournalView.tsx
+++ b/src/JournalView.tsx
@@ -5,11 +5,11 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 import { EteSyncContextType } from './EteSyncContext';
 import * as EteSync from './api/EteSync';
 
-import { JournalViewEntries } from './JournalViewEntries';
-import { JournalViewAddressBook } from './JournalViewAddressBook';
-import { JournalViewCalendar } from './JournalViewCalendar';
+import JournalViewEntries from './JournalViewEntries';
+import JournalViewAddressBook from './JournalViewAddressBook';
+import JournalViewCalendar from './JournalViewCalendar';
 
-export class JournalView extends React.Component {
+class JournalView extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -98,3 +98,5 @@ export class JournalView extends React.Component {
     );
   }
 }
+
+export default JournalView;
diff --git a/src/JournalViewAddressBook.tsx b/src/JournalViewAddressBook.tsx
index c140bfd..5a18712 100644
--- a/src/JournalViewAddressBook.tsx
+++ b/src/JournalViewAddressBook.tsx
@@ -8,9 +8,9 @@ import * as ICAL from 'ical.js';
 import * as EteSync from './api/EteSync';
 
 import { routeResolver } from './App';
-import { JournalViewContact } from './JournalViewContact';
+import JournalViewContact from './JournalViewContact';
 
-export class JournalViewAddressBook extends React.Component {
+class JournalViewAddressBook extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -94,3 +94,5 @@ export class JournalViewAddressBook extends React.Component {
     );
   }
 }
+
+export default JournalViewAddressBook;
diff --git a/src/JournalViewCalendar.tsx b/src/JournalViewCalendar.tsx
index d31172b..34e46ea 100644
--- a/src/JournalViewCalendar.tsx
+++ b/src/JournalViewCalendar.tsx
@@ -33,7 +33,7 @@ class EventWrapper {
   }
 }
 
-export class JournalViewCalendar extends React.Component {
+class JournalViewCalendar extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -100,3 +100,5 @@ export class JournalViewCalendar extends React.Component {
     );
   }
 }
+
+export default JournalViewCalendar;
diff --git a/src/JournalViewContact.tsx b/src/JournalViewContact.tsx
index 1885238..e2b3af9 100644
--- a/src/JournalViewContact.tsx
+++ b/src/JournalViewContact.tsx
@@ -8,7 +8,7 @@ import { indigo500 } from 'material-ui/styles/colors';
 
 import * as ICAL from 'ical.js';
 
-export class JournalViewContact extends React.Component {
+class JournalViewContact extends React.Component {
   props: {
     contact?: ICAL.Component,
   };
@@ -84,3 +84,5 @@ export class JournalViewContact extends React.Component {
     );
   }
 }
+
+export default JournalViewContact;
diff --git a/src/JournalViewEntries.tsx b/src/JournalViewEntries.tsx
index 6e0d174..dd9a645 100644
--- a/src/JournalViewEntries.tsx
+++ b/src/JournalViewEntries.tsx
@@ -10,7 +10,7 @@ import * as ICAL from 'ical.js';
 
 import * as EteSync from './api/EteSync';
 
-export class JournalViewEntries extends React.Component {
+class JournalViewEntries extends React.Component {
   static defaultProps = {
     prevUid: null,
   };
@@ -106,3 +106,5 @@ export class JournalViewEntries extends React.Component {
     );
   }
 }
+
+export default JournalViewEntries;