diff --git a/pytrustnfe/__init__.py b/pytrustnfe/__init__.py
index e69de29..daebf5d 100644
--- a/pytrustnfe/__init__.py
+++ b/pytrustnfe/__init__.py
@@ -0,0 +1 @@
+import servicos
diff --git a/pytrustnfe/servicos/__init__.py b/pytrustnfe/servicos/__init__.py
index e69de29..95b522b 100644
--- a/pytrustnfe/servicos/__init__.py
+++ b/pytrustnfe/servicos/__init__.py
@@ -0,0 +1,2 @@
+import assinatura
+import comunicacao
\ No newline at end of file
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..c33e53e
--- /dev/null
+++ b/test/__init__.py
@@ -0,0 +1 @@
+import test_assinatura
\ No newline at end of file
diff --git a/tests/AssinaturaTest.py b/test/test_assinatura.py
similarity index 81%
rename from tests/AssinaturaTest.py
rename to test/test_assinatura.py
index 4127e7f..e261e49 100644
--- a/tests/AssinaturaTest.py
+++ b/test/test_assinatura.py
@@ -16,16 +16,16 @@ XML_ASSINAR = '<?xml version="1.0" encoding="UTF-8"?>' \
 
 XML_ASSINADO = ''
 
-class Test(unittest.TestCase):
+class test_assinatura(unittest.TestCase):
 
-    def testAssinarXml(self):
-        
+    def test_assinar_xml(self):
+        print 'oola'
         assinatura = Assinatura('/home/danimar/Desktop/INFOGER.pfx', '123456')
         
         self.assertRaises(RuntimeError, assinatura.assina_xml, XML_ASSINAR)
 
 
-if __name__ == "__main__":
+#if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']
-    unittest.main()
+#    unittest.main()
     
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29..0000000