diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js
index f75146f0a..3dc69400c 100644
--- a/client/coral-embed-stream/src/index.js
+++ b/client/coral-embed-stream/src/index.js
@@ -2,8 +2,8 @@ import React from 'react';
 import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
 
-import {client} from 'coral-framework/client';
-import store from 'coral-framework/store';
+import {client} from 'coral-framework/services/client';
+import store from 'coral-framework/services/store';
 
 import Embed from './Embed';
 
diff --git a/client/coral-framework/index.js b/client/coral-framework/index.js
index d2cd4197b..56a2e522c 100644
--- a/client/coral-framework/index.js
+++ b/client/coral-framework/index.js
@@ -1,5 +1,5 @@
-import store from './store';
-import pym from './PymConnection';
+import store from './services/store';
+import pym from './services/PymConnection';
 import I18n from './modules/i18n/i18n';
 import * as authActions from './actions/auth';
 import * as assetActions from './actions/asset';
diff --git a/client/coral-framework/services/PymConnection.js b/client/coral-framework/services/PymConnection.js
index ca592b824..6c492f2b8 100644
--- a/client/coral-framework/services/PymConnection.js
+++ b/client/coral-framework/services/PymConnection.js
@@ -1,4 +1,4 @@
-import Pym from '../../node_modules/pym.js';
+import Pym from '../../../node_modules/pym.js';
 
 const pym = new Pym.Child({polling: 100});
 export default pym;
diff --git a/client/coral-framework/services/store.js b/client/coral-framework/services/store.js
index 439569ee1..bf2735e45 100644
--- a/client/coral-framework/services/store.js
+++ b/client/coral-framework/services/store.js
@@ -1,6 +1,6 @@
 import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
 import thunk from 'redux-thunk';
-import mainReducer from './reducers';
+import mainReducer from '../reducers';
 import {client} from './client';
 
 const middlewares = [
diff --git a/client/coral-settings/containers/SettingsContainer.js b/client/coral-settings/containers/SettingsContainer.js
index f02badd80..cda0c657d 100644
--- a/client/coral-settings/containers/SettingsContainer.js
+++ b/client/coral-settings/containers/SettingsContainer.js
@@ -7,7 +7,7 @@ import {myCommentHistory} from 'coral-framework/graphql/queries';
 import {saveBio} from 'coral-framework/actions/user';
 
 import BioContainer from './BioContainer';
-import {link} from 'coral-framework/PymConnection';
+import {link} from 'coral-framework/services/PymConnection';
 import NotLoggedIn from '../components/NotLoggedIn';
 import {TabBar, Tab, TabContent, Spinner} from 'coral-ui';
 import SettingsHeader from '../components/SettingsHeader';