diff --git a/pisi/commonargs.py b/pisi/cli/commonargs.py
similarity index 100%
rename from pisi/commonargs.py
rename to pisi/cli/commonargs.py
diff --git a/pisi/metadata.py b/pisi/metadata.py
index 88e1aa03..7f3cd35d 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -82,7 +82,8 @@ class MetaData(XmlFile):
         self.writexml(filename)
 
     def verify(self):
-        assert self.source.name != None
-        assert self.source.packager != None
-        assert self.package != None
+        ret = True
+        ret &= self.source.name != None
+        ret &= self.source.packager != None
+        ret &= self.package != None
         return True
diff --git a/setup.py b/setup.py
index a45a1e75..16d1c694 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ setup(name="pisi",
       author_email="hotmail@uludag.org.tr",
       url="http://uludag.org.tr",
       package_dir = {'': ''},
-      packages = ['pisi', 'pisi.actionsapi'],
+      packages = ['pisi', 'pisi.cli', 'pisi.actionsapi'],
       package_data = {'pisi.actionsapi' : ['share/*'] }
       scripts = ['pisi-build', 'pisi-install']
      )