diff --git a/src/index.ts b/src/index.ts
index 37b86e7c..4b16f28e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,9 +5,10 @@
  * Note that dynamic values, such as a date or a commit hash are added by rollup
  */
 export { Component } from "./component";
-export { EventBus } from "./event_bus";
-export { Observer } from "./observer";
+import { EventBus } from "./event_bus";
+import { Observer } from "./observer";
 
+export const misc = {EventBus, Observer};
 // we need to import manually the extra directives so they can register
 // themselves in QWeb, otherwise these files will not even be loaded.
 import "./qweb_directives";
@@ -15,7 +16,9 @@ import "./qweb_extensions";
 import { QWeb } from "./qweb_core";
 export { QWeb };
 
-export { Store, ConnectedComponent } from "./store";
+import { Store, ConnectedComponent } from "./store";
+
+export const store = {Store, ConnectedComponent};
 import * as _utils from "./utils";
 
 export const __info__ = {};
diff --git a/tests/store.test.ts b/tests/store.test.ts
index 04768d92..0a3a5984 100644
--- a/tests/store.test.ts
+++ b/tests/store.test.ts
@@ -1,7 +1,9 @@
 import { Component, Env } from "../src/component";
 import { Store, ConnectedComponent } from "../src/store";
 import { makeTestFixture, makeTestEnv, nextMicroTick, nextTick } from "./helpers";
-import { Observer } from "../src";
+import { misc } from "../src";
+
+const Observer = misc.Observer;
 
 describe("basic use", () => {
   test("commit a mutation", () => {
diff --git a/tools/playground/samples.js b/tools/playground/samples.js
index 5cc0cb50..2cbacbf6 100644
--- a/tools/playground/samples.js
+++ b/tools/playground/samples.js
@@ -338,7 +338,7 @@ function makeStore() {
         todos,
         nextId
     };
-    const store = new owl.Store({
+    const store = new owl.store.Store({
         state,
         actions,
         mutations
@@ -405,7 +405,7 @@ class TodoItem extends owl.Component {
 //------------------------------------------------------------------------------
 // TodoApp
 //------------------------------------------------------------------------------
-class TodoApp extends owl.ConnectedComponent {
+class TodoApp extends owl.store.ConnectedComponent {
     components = { TodoItem };
     state = { filter: "all" };