diff --git a/src/PimMain.tsx b/src/Pim/PimMain.tsx
similarity index 89%
rename from src/PimMain.tsx
rename to src/Pim/PimMain.tsx
index dd7949a..858c1d3 100644
--- a/src/PimMain.tsx
+++ b/src/Pim/PimMain.tsx
@@ -5,16 +5,16 @@ import { Tabs, Tab } from 'material-ui/Tabs';
 
 import * as ICAL from 'ical.js';
 
-import Container from './widgets/Container';
+import Container from '../widgets/Container';
 
-import AddressBook from './components/AddressBook';
-import Calendar from './components/Calendar';
+import AddressBook from '../components/AddressBook';
+import Calendar from '../components/Calendar';
 
-import { EventType, ContactType } from './pim-types';
+import { EventType, ContactType } from '../pim-types';
 
-import { routeResolver } from './App';
+import { routeResolver } from '../App';
 
-import { historyPersistor } from './persist-state-history';
+import { historyPersistor } from '../persist-state-history';
 
 const addressBookTitle = 'Address Book';
 const calendarTitle = 'Calendar';
diff --git a/src/Pim.tsx b/src/Pim/index.tsx
similarity index 92%
rename from src/Pim.tsx
rename to src/Pim/index.tsx
index f572eb6..428067f 100644
--- a/src/Pim.tsx
+++ b/src/Pim/index.tsx
@@ -3,29 +3,29 @@ import { Route, Switch } from 'react-router';
 import RaisedButton from 'material-ui/RaisedButton';
 import IconEdit from 'material-ui/svg-icons/editor/mode-edit';
 
-import * as EteSync from './api/EteSync';
+import * as EteSync from '../api/EteSync';
 
 import { createSelector } from 'reselect';
 
-import { ContactType, EventType } from './pim-types';
+import { ContactType, EventType } from '../pim-types';
 
-import Container from './widgets/Container';
+import Container from '../widgets/Container';
 
-import ContactEdit from './components/ContactEdit';
-import Contact from './components/Contact';
-import EventEdit from './components/EventEdit';
-import Event from './components/Event';
+import ContactEdit from '../components/ContactEdit';
+import Contact from '../components/Contact';
+import EventEdit from '../components/EventEdit';
+import Event from '../components/Event';
 import PimMain from './PimMain';
 
-import { routeResolver } from './App';
+import { routeResolver } from '../App';
 
-import { store, CredentialsData } from './store';
+import { store, CredentialsData } from '../store';
 
-import { SyncInfo } from './SyncGate';
+import { SyncInfo } from '../SyncGate';
 
-import { createJournalEntry } from './etesync-helpers';
+import { createJournalEntry } from '../etesync-helpers';
 
-import { syncEntriesToItemMap, syncEntriesToCalendarItemMap } from './journal-processors';
+import { syncEntriesToItemMap, syncEntriesToCalendarItemMap } from '../journal-processors';
 
 function objValues(obj: any) {
   return Object.keys(obj).map((x) => obj[x]);