diff --git a/lib/cdist/core/__init__.py b/lib/cdist/core/__init__.py
index d6377b12..1dec9e8f 100644
--- a/lib/cdist/core/__init__.py
+++ b/lib/cdist/core/__init__.py
@@ -19,8 +19,8 @@
 #
 #
 
-__all__ = ['Type', 'Object']
-
 from cdist.core.type import Type
 from cdist.core.object import Object
-from cdist.core.global_explorer import GlobalExplorer
+from cdist.core.explorer import Explorer
+from cdist.core.manifest import Manifest
+from cdist.core.code import Code