diff --git a/balance.py b/balance.py
index 00af493..9245385 100755
--- a/balance.py
+++ b/balance.py
@@ -4,7 +4,7 @@ import sys, argparse, os
 from os.path import join, dirname
 from shutil import copyfile
 from dotenv import load_dotenv
-from libs.balancelib import Balance
+from lib.balancelib import Balance
 
 # Get variables environment
 if not os.path.isfile('.env'):
diff --git a/history.py b/history.py
index 4152d91..03b5cf4 100755
--- a/history.py
+++ b/history.py
@@ -4,7 +4,7 @@ import sys, argparse, os
 from os.path import join, dirname
 from shutil import copyfile
 from dotenv import load_dotenv
-from libs.historylib import History
+from lib.historylib import History
 
 # Get variables environment
 if not os.path.isfile('.env'):
diff --git a/libs/balancelib.py b/lib/balancelib.py
similarity index 98%
rename from libs/balancelib.py
rename to lib/balancelib.py
index 5299b3a..cb65660 100644
--- a/libs/balancelib.py
+++ b/lib/balancelib.py
@@ -2,7 +2,7 @@
 
 import sys, re, os.path, json, ast
 from termcolor import colored
-from natools import fmt, sign, get_privkey
+from lib.natools import fmt, sign, get_privkey
 from gql import gql, Client
 from gql.transport.aiohttp import AIOHTTPTransport
 
diff --git a/libs/historylib.py b/lib/historylib.py
similarity index 98%
rename from libs/historylib.py
rename to lib/historylib.py
index 7270837..eef7894 100644
--- a/libs/historylib.py
+++ b/lib/historylib.py
@@ -3,7 +3,7 @@
 import sys, re, os.path, json, ast
 from datetime import datetime
 from termcolor import colored
-from natools import fmt, sign, get_privkey
+from lib.natools import fmt, sign, get_privkey
 from gql import gql, Client
 from gql.transport.aiohttp import AIOHTTPTransport
 
diff --git a/natools.py b/lib/natools.py
similarity index 100%
rename from natools.py
rename to lib/natools.py
diff --git a/libs/paylib.py b/lib/paylib.py
similarity index 98%
rename from libs/paylib.py
rename to lib/paylib.py
index 5948ab7..1aba591 100644
--- a/libs/paylib.py
+++ b/lib/paylib.py
@@ -2,7 +2,7 @@
 
 import sys, re, os.path, json, ast
 from termcolor import colored
-from natools import fmt, sign, get_privkey
+from lib.natools import fmt, sign, get_privkey
 from gql import gql, Client
 from gql.transport.aiohttp import AIOHTTPTransport
 
@@ -34,7 +34,7 @@ class Transaction:
 
     def genDoc(self):
         # Build TX generation document
-        print(self.useMempool)
+        # print(self.useMempool)
         queryBuild = gql(
             """
             query ($recipient: String!, $issuer: String!, $amount: Int!, $comment: String!, $useMempool: Boolean!){ genTxs(
diff --git a/pay.py b/pay.py
index f39a3f4..5cc9a6c 100755
--- a/pay.py
+++ b/pay.py
@@ -4,7 +4,7 @@ import sys, argparse, os
 from os.path import join, dirname
 from shutil import copyfile
 from dotenv import load_dotenv
-from libs.paylib import Transaction
+from lib.paylib import Transaction
 
 VERSION = "0.1.1"