diff --git a/build-debian-cloud b/build-debian-cloud
index 6c373a8..413dfaa 100755
--- a/build-debian-cloud
+++ b/build-debian-cloud
@@ -3,4 +3,4 @@
 
 if __name__ == '__main__' and __package__ is None:
 	from common import main
-	main.main()
+	main()
diff --git a/common/__init__.py b/common/__init__.py
index 3c5ce38..4e7fce5 100644
--- a/common/__init__.py
+++ b/common/__init__.py
@@ -1,5 +1,6 @@
+__all__ = ['BootstrapInformation', 'Manifest', 'Task', 'TaskList', 'main']
 from bootstrapinfo import BootstrapInformation
 from manifest import Manifest
 from task import Task
 from tasklist import TaskList
-from plugin import Plugin
+from main import main
diff --git a/providers/ec2/tasks/__init__.py b/providers/ec2/tasks/__init__.py
index e69de29..0b293e0 100644
--- a/providers/ec2/tasks/__init__.py
+++ b/providers/ec2/tasks/__init__.py
@@ -0,0 +1 @@
+__all__ = ['packages', 'ec2', 'host']