1 files changed, 17 insertions, 8 deletions
diff --git a/src/nbblib/__init__.py b/src/nbblib/__init__.py
index d1632a8..95fe6da 100644
--- a/src/nbblib/__init__.py
+++ b/src/nbblib/__init__.py
@@ -1,9 +1,18 @@
-from nbblib.bs import *
-from nbblib.commands import *
-from nbblib.package import *
-from nbblib.plugins import *
-from nbblib.vcs import *
-from nbblib.bs import *
+#from nbblib.bs import *
+#from nbblib.commands import *
+#from nbblib.package import *
+#from nbblib.plugins import *
+#from nbblib.vcs import *
 
-for submodule in ('newplugins', ):
-    setattr(__module__, submodule, __import__("nbblib.%s" % submodule))
+import nbblib.bs as bs
+import nbblib.commands as commands
+import nbblib.newplugins as newplugins
+import nbblib.package as package
+import nbblib.plugins as plugins
+import nbblib.vcs as plugins
+
+from package import PACKAGE_VERSION
+
+__all__ = ['bs', 'commands', 'newplugins',
+           'package', 'plugins', 'vcs',
+           'PACKAGE_VERSION']