diff --git a/database-fetch.src b/scanner/database-fetch.src
similarity index 100%
rename from database-fetch.src
rename to scanner/database-fetch.src
diff --git a/database.src b/scanner/database.src
similarity index 73%
rename from database.src
rename to scanner/database.src
index 578804a..5d73bc3 100644
--- a/database.src
+++ b/scanner/database.src
@@ -1,8 +1,7 @@
-// import database lib
-import_code("/scanner/libbindb.src")
-
 // connect to database
-myDB = BinDB.connect("vuln", "Fizeta7-Nyzi0=Sinuvi5-Golepa4", ["kernel_router.so", "libssh.so", "libftp.so","libsql.so","libsmtp.so","libhttp.so","libcam.so","librepository.so"], "/database")
+database = function()
+	myDB = BinDB.connect("vuln", "Fizeta7-Nyzi0=Sinuvi5-Golepa4", ["kernel_router.so", "libssh.so", "libftp.so","libsql.so","libsmtp.so","libhttp.so","libcam.so","librepository.so"], "/database")
+end function
 
 // insert exploit with check if it already exists.
 // TODO: Add option to update missing data (requirments)
diff --git a/libbindb.src b/scanner/libbindb.src
similarity index 100%
rename from libbindb.src
rename to scanner/libbindb.src
diff --git a/Scanner.src b/scanner/scanner.src
similarity index 96%
rename from Scanner.src
rename to scanner/scanner.src
index 9bc5918..e9638f4 100644
--- a/Scanner.src
+++ b/scanner/scanner.src
@@ -1,5 +1,8 @@
 // name import Database/functions
-import_code("/root/myprogram")
+import_code("/dev/scanner/libbindb.src")
+import_code("/dev/scanner/database.src")
+
+myDB = database()
 
 if params.len == 0 then exit("<b>Usage: </b>scanner [IP/WEB_Address]")
 
diff --git a/get_bank.src b/tool/get_bank.src
similarity index 100%
rename from get_bank.src
rename to tool/get_bank.src
diff --git a/get_shell.src b/tool/get_shell.src
similarity index 100%
rename from get_shell.src
rename to tool/get_shell.src
diff --git a/nmap.src b/tool/nmap.src
similarity index 79%
rename from nmap.src
rename to tool/nmap.src
index b8dfbd6..58d7cb9 100644
--- a/nmap.src
+++ b/tool/nmap.src
@@ -1,5 +1,9 @@
+//comment out if using a stand alone tool
 nmap = function(target_ip)
 
+	//uncomment is not using as import. 
+	//if params.len != 1 or params[0] == "-h" or params[0] == "--help" then exit("<b>Usage: "+program_path.split("/")[-1]+" [ip_address]</b>")
+
 	target_ip = params[0]
 	if not is_valid_ip(target_ip) then exit(target_ip + " is not a valid ip") 
 
@@ -24,4 +28,5 @@ nmap = function(target_ip)
 
 	return router_data
 
+//comment out if using a stand alone tool
 end function
\ No newline at end of file
diff --git a/tool.src b/tool/tool.src
similarity index 100%
rename from tool.src
rename to tool/tool.src