diff --git a/client.js b/client.js
index e1250b097a..926b93d70b 100644
--- a/client.js
+++ b/client.js
@@ -1 +1 @@
-module.exports = require('./lib/client');
+module.exports = require('./lib/client/index');
diff --git a/src/application.js b/src/application.js
index efce9e2ff2..e76785ca6f 100644
--- a/src/application.js
+++ b/src/application.js
@@ -1,7 +1,7 @@
 import makeDebug from 'debug';
 import { stripSlashes } from 'feathers-commons';
 import Uberproto from 'uberproto';
-import mixins from './mixins';
+import mixins from './mixins/index';
 
 const debug = makeDebug('feathers:application');
 const methods = ['find', 'get', 'create', 'update', 'patch', 'remove'];