diff --git a/src/AddressBook.tsx b/src/AddressBook.tsx
index b975042..7f1c8c0 100644
--- a/src/AddressBook.tsx
+++ b/src/AddressBook.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
 
 import * as colors from 'material-ui/styles/colors';
 
-import { Avatar } from './Avatar';
-import { List, ListItem } from './List';
+import { Avatar } from './widgets/Avatar';
+import { List, ListItem } from './widgets/List';
 
 import { ContactType } from './pim-types';
 
diff --git a/src/Contact.tsx b/src/Contact.tsx
index 5076bf5..3fd0104 100644
--- a/src/Contact.tsx
+++ b/src/Contact.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import * as moment from 'moment';
 
-import { List, ListItem, ListDivider as Divider } from './List';
+import { List, ListItem, ListDivider as Divider } from './widgets/List';
 import IconHome from 'material-ui/svg-icons/action/home';
 import IconDate from 'material-ui/svg-icons/action/date-range';
 import CommunicationCall from 'material-ui/svg-icons/communication/call';
diff --git a/src/EventEdit.tsx b/src/EventEdit.tsx
index 06a8882..eeeb13d 100644
--- a/src/EventEdit.tsx
+++ b/src/EventEdit.tsx
@@ -5,7 +5,7 @@ import TextField from 'material-ui/TextField';
 import SelectField from 'material-ui/SelectField';
 import MenuItem from 'material-ui/MenuItem';
 
-import DateTimePicker from './DateTimePicker';
+import DateTimePicker from './widgets/DateTimePicker';
 
 import * as uuid from 'uuid';
 import * as ICAL from 'ical.js';
diff --git a/src/Journal.tsx b/src/Journal.tsx
index 4e6177c..4ff8de9 100644
--- a/src/Journal.tsx
+++ b/src/Journal.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Tabs, Tab } from 'material-ui/Tabs';
 
-import Container from './Container';
+import Container from './widgets/Container';
 
 import SecondaryHeader from './SecondaryHeader';
 
diff --git a/src/JournalEntries.tsx b/src/JournalEntries.tsx
index b0f329e..d733e7b 100644
--- a/src/JournalEntries.tsx
+++ b/src/JournalEntries.tsx
@@ -1,7 +1,7 @@
 import * as Immutable from 'immutable';
 
 import * as React from 'react';
-import { List, ListItem } from './List';
+import { List, ListItem } from './widgets/List';
 import Dialog from 'material-ui/Dialog';
 import FlatButton from 'material-ui/FlatButton';
 import IconAdd from 'material-ui/svg-icons/content/add';
diff --git a/src/Pim.tsx b/src/Pim.tsx
index 3f9d735..407fbac 100644
--- a/src/Pim.tsx
+++ b/src/Pim.tsx
@@ -9,7 +9,7 @@ import { createSelector } from 'reselect';
 
 import { ContactType, EventType } from './pim-types';
 
-import Container from './Container';
+import Container from './widgets/Container';
 
 import ContactEdit from './ContactEdit';
 import Contact from './Contact';
diff --git a/src/PimMain.tsx b/src/PimMain.tsx
index 169bb5e..231fc24 100644
--- a/src/PimMain.tsx
+++ b/src/PimMain.tsx
@@ -5,7 +5,7 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 
 import * as ICAL from 'ical.js';
 
-import Container from './Container';
+import Container from './widgets/Container';
 
 import AddressBook from './AddressBook';
 import Calendar from './Calendar';
diff --git a/src/Root.tsx b/src/Root.tsx
index 4b67554..2503833 100644
--- a/src/Root.tsx
+++ b/src/Root.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 
-import Container from './Container';
+import Container from './widgets/Container';
 import SyncGate from './SyncGate';
 import LoginForm from './LoginForm';
 
diff --git a/src/SideMenu.tsx b/src/SideMenu.tsx
index aab213d..ec40cce 100644
--- a/src/SideMenu.tsx
+++ b/src/SideMenu.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
-import { List, ListItem, ListSubheader, ListDivider } from './List';
+import { List, ListItem, ListSubheader, ListDivider } from './widgets/List';
 import ActionCode from 'material-ui/svg-icons/action/code';
 import ActionHome from 'material-ui/svg-icons/action/home';
 import ActionBugReport from 'material-ui/svg-icons/action/bug-report';
diff --git a/src/SideMenuJournals.tsx b/src/SideMenuJournals.tsx
index deb4885..df52c33 100644
--- a/src/SideMenuJournals.tsx
+++ b/src/SideMenuJournals.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { ListItem } from './List';
+import { ListItem } from './widgets/List';
 
 import * as EteSync from './api/EteSync';
 
diff --git a/src/SyncGate.tsx b/src/SyncGate.tsx
index 637ddc2..6ea751c 100644
--- a/src/SyncGate.tsx
+++ b/src/SyncGate.tsx
@@ -7,7 +7,7 @@ import { createSelector } from 'reselect';
 
 import { routeResolver } from './App';
 
-import LoadingIndicator from './LoadingIndicator';
+import LoadingIndicator from './widgets/LoadingIndicator';
 
 import Journal from './Journal';
 import Pim from './Pim';
diff --git a/src/Avatar.tsx b/src/widgets/Avatar.tsx
similarity index 100%
rename from src/Avatar.tsx
rename to src/widgets/Avatar.tsx
diff --git a/src/Container.css b/src/widgets/Container.css
similarity index 100%
rename from src/Container.css
rename to src/widgets/Container.css
diff --git a/src/Container.tsx b/src/widgets/Container.tsx
similarity index 100%
rename from src/Container.tsx
rename to src/widgets/Container.tsx
diff --git a/src/DateTimePicker.tsx b/src/widgets/DateTimePicker.tsx
similarity index 100%
rename from src/DateTimePicker.tsx
rename to src/widgets/DateTimePicker.tsx
diff --git a/src/List.css b/src/widgets/List.css
similarity index 100%
rename from src/List.css
rename to src/widgets/List.css
diff --git a/src/List.tsx b/src/widgets/List.tsx
similarity index 100%
rename from src/List.tsx
rename to src/widgets/List.tsx
diff --git a/src/LoadingIndicator.tsx b/src/widgets/LoadingIndicator.tsx
similarity index 100%
rename from src/LoadingIndicator.tsx
rename to src/widgets/LoadingIndicator.tsx