--- a/client/src/reducers/index.js	Tue Jul 25 19:11:26 2017 +0200
+++ b/client/src/reducers/index.js	Fri Jul 28 19:40:35 2017 +0200
@@ -1,27 +1,34 @@
-//import { combineReducers } from 'redux-immutable';
-import { combineReducers } from 'redux';
+import { combineReducers } from 'redux-immutable';
 import { routerReducer } from 'react-router-redux';
 
 import notes from './notesReducer';
 import { sessions } from './sessionsReducer';
-import { isAuthenticated, currentUser, login, register, token, groups, createGroup } from './authReducer';
-import { autoSubmit, outbox } from './miscReducer';
+import { isAuthenticated, currentUser, login, register, token, groups, createGroup, clientId } from './authReducer';
+import { autoSubmit, online } from './miscReducer';
+import { isSynchronizing, lastSync } from './syncReducer';
+
 
 const rootReducer = combineReducers({
   sessions,
   notes,
-  isAuthenticated,
-  currentUser,
   login,
   register,
-  token,
+  authStatus: combineReducers({
+    token,
+    currentUser,
+    isAuthenticated,
+    clientId,
+    lastSync
+  }),
+  status: combineReducers({
+    isSynchronizing,
+    online
+  }),
   router: routerReducer,
   autoSubmit,
   groups,
   createGroup,
-  offline: combineReducers({
-    outbox
-  })
 });
 
+
 export default rootReducer;