diff --git a/jupyter-openbis-extension/__init__.py b/jupyter-openbis-extension/__init__.py
index 032652cf4581de8167edaad981442e54fdc49552..8fc333574378a6b62647edebb1e0eb6efd81ebf1 100644
--- a/jupyter-openbis-extension/__init__.py
+++ b/jupyter-openbis-extension/__init__.py
@@ -3,6 +3,10 @@ __author__ = 'Swen Vermeul'
 __email__ = 'swen@ethz.ch'
 __version__ = '0.0.2'
 
+from . import connection
+from . import sample
+
+
 def _jupyter_server_extension_paths():
     return [{
         "module": "jupyter-openbis-extension.server"
diff --git a/jupyter-openbis-extension/connection.py b/jupyter-openbis-extension/connection.py
index 4999b5c04a28fd9a5d3c2ea818f997d1e54d7b6e..be36cbb321ce71e2b164d9d06762937d18912706 100644
--- a/jupyter-openbis-extension/connection.py
+++ b/jupyter-openbis-extension/connection.py
@@ -18,7 +18,6 @@ def register_connection(connection_info):
     return conn
 
 
-
 class OpenBISConnection:
     """register an openBIS connection
     """