diff --git a/packages/custom-collection-demo/lib/components/MoviesList.jsx b/packages/custom-collection-demo/lib/components/MoviesList.jsx
index 1d0e59469..8b952dd77 100644
--- a/packages/custom-collection-demo/lib/components/MoviesList.jsx
+++ b/packages/custom-collection-demo/lib/components/MoviesList.jsx
@@ -4,11 +4,9 @@ import NovaForm from "meteor/nova:forms";
 import { Button } from 'react-bootstrap';
 import { Accounts } from 'meteor/std:accounts-ui';
 import { ModalTrigger } from "meteor/nova:core";
-import withMoviesList from '../containers/withMoviesList';
-import withList from '../containers/withList';
 import Movie from './Movie.jsx';
 import Movies from '../collection.js';
-import { withCurrentUser } from 'meteor/nova:core';
+import { withCurrentUser, withList } from 'meteor/nova:core';
 import { moviesListProps, moviesSingleProps } from '../containers/fragments.js';
 
 const LoadMore = props => <a href="#" className="load-more button button--primary" onClick={props.loadMore}>Load More ({props.count}/{props.totalCount})</a>
diff --git a/packages/nova-core/lib/client.js b/packages/nova-core/lib/client.js
index 33652b390..0a6655308 100644
--- a/packages/nova-core/lib/client.js
+++ b/packages/nova-core/lib/client.js
@@ -1,13 +1,14 @@
 import './modules.js';
 
-import './subscriptions.js';
-
 import Messages from './messages.js';
 import ModalTrigger from './components/ModalTrigger.jsx';
 import ContextPasser from './components/ContextPasser.jsx';
 import FlashContainer from "./containers/FlashContainer.jsx";
 import AppComposer from './containers/AppComposer.jsx';
 import withCurrentUser from './containers/withCurrentUser.js';
-// import NovaCounts from './counts.js';
+import withList from './containers/withList.js';
+import withNew from './containers/withNew.jsx';
+import withEdit from './containers/withEdit.jsx';
+import withRemove from './containers/withRemove.jsx';
 
-export { Messages, ModalTrigger, ContextPasser, AppComposer, FlashContainer, withCurrentUser };
\ No newline at end of file
+export { Messages, ModalTrigger, ContextPasser, AppComposer, FlashContainer, withCurrentUser, withList, withNew, withEdit, withRemove };
\ No newline at end of file
diff --git a/packages/nova-forms/lib/withEdit.jsx b/packages/nova-core/lib/containers/withEdit.jsx
similarity index 100%
rename from packages/nova-forms/lib/withEdit.jsx
rename to packages/nova-core/lib/containers/withEdit.jsx
diff --git a/packages/custom-collection-demo/lib/containers/withList.js b/packages/nova-core/lib/containers/withList.js
similarity index 98%
rename from packages/custom-collection-demo/lib/containers/withList.js
rename to packages/nova-core/lib/containers/withList.js
index e7ae3c521..787a21476 100644
--- a/packages/custom-collection-demo/lib/containers/withList.js
+++ b/packages/nova-core/lib/containers/withList.js
@@ -1,6 +1,5 @@
 import Telescope from 'meteor/nova:lib';
 import React, { PropTypes, Component } from 'react';
-import Movies from '../collection.js';
 import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
 
diff --git a/packages/nova-forms/lib/withNew.jsx b/packages/nova-core/lib/containers/withNew.jsx
similarity index 100%
rename from packages/nova-forms/lib/withNew.jsx
rename to packages/nova-core/lib/containers/withNew.jsx
diff --git a/packages/nova-forms/lib/withRemove.jsx b/packages/nova-core/lib/containers/withRemove.jsx
similarity index 100%
rename from packages/nova-forms/lib/withRemove.jsx
rename to packages/nova-core/lib/containers/withRemove.jsx
diff --git a/packages/nova-core/lib/server.js b/packages/nova-core/lib/server.js
index 143fd5de8..305baee69 100644
--- a/packages/nova-core/lib/server.js
+++ b/packages/nova-core/lib/server.js
@@ -8,5 +8,9 @@ import ContextPasser from "./components/ContextPasser.jsx";
 import FlashContainer from "./containers/FlashContainer.jsx";
 import AppComposer from "./containers/AppComposer.jsx";
 import withCurrentUser from './containers/withCurrentUser.js';
+import withList from './containers/withList.js';
+import withNew from './containers/withNew.jsx';
+import withEdit from './containers/withEdit.jsx';
+import withRemove from './containers/withRemove.jsx';
 
-export { Messages, ModalTrigger, ContextPasser, AppComposer, FlashContainer, withCurrentUser };
\ No newline at end of file
+export { Messages, ModalTrigger, ContextPasser, AppComposer, FlashContainer, withCurrentUser, withList, withNew, withEdit, withRemove };
\ No newline at end of file
diff --git a/packages/nova-core/lib/subscriptions.js b/packages/nova-core/lib/subscriptions.js
deleted file mode 100644
index 8e9963d19..000000000
--- a/packages/nova-core/lib/subscriptions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Meteor.startup(() => {
-//   Meteor.subscribe('users.current');
-// });
\ No newline at end of file
diff --git a/packages/nova-forms/lib/FormWrapper.jsx b/packages/nova-forms/lib/FormWrapper.jsx
index 3d3a51ad6..89f35563b 100644
--- a/packages/nova-forms/lib/FormWrapper.jsx
+++ b/packages/nova-forms/lib/FormWrapper.jsx
@@ -3,11 +3,9 @@ import { FormattedMessage, intlShape } from 'react-intl';
 import Formsy from 'formsy-react';
 import { Button } from 'react-bootstrap';
 import { withApollo, compose } from 'react-apollo';
-import { withCurrentUser } from 'meteor/nova:core';
+import { withCurrentUser, withNew, withEdit } from 'meteor/nova:core';
 import Flash from "./Flash.jsx";
 import FormGroup from "./FormGroup.jsx";
-import withEdit from './withEdit.jsx';
-import withNew from './withNew.jsx';
 import { flatten, deepValue, getEditableFields, getInsertableFields } from './utils.js';
 
 
@@ -520,4 +518,3 @@ module.exports = compose(
   withNew,
   withApollo
 )(FormWrapper);
-// export default withCurrentUser(withEdit(withNew(FormWrapper)));