diff --git a/Get-ZimmermanTools.ps1 b/codegrab/Get-ZimmermanTools.ps1
similarity index 100%
rename from Get-ZimmermanTools.ps1
rename to codegrab/Get-ZimmermanTools.ps1
diff --git a/certwipe b/codegrab/certwipe
similarity index 100%
rename from certwipe
rename to codegrab/certwipe
diff --git a/chechsqlite.py b/codegrab/chechsqlite.py
similarity index 100%
rename from chechsqlite.py
rename to codegrab/chechsqlite.py
diff --git a/cloudsend.py b/codegrab/cloudsend.py
similarity index 100%
rename from cloudsend.py
rename to codegrab/cloudsend.py
diff --git a/cloudsend.sh b/codegrab/cloudsend.sh
similarity index 100%
rename from cloudsend.sh
rename to codegrab/cloudsend.sh
diff --git a/csv_cols b/codegrab/csv_cols
similarity index 100%
rename from csv_cols
rename to codegrab/csv_cols
diff --git a/ctf/ctf b/codegrab/ctf/ctf
similarity index 100%
rename from ctf/ctf
rename to codegrab/ctf/ctf
diff --git a/ctf/filtertext.py b/codegrab/ctf/filtertext.py
similarity index 100%
rename from ctf/filtertext.py
rename to codegrab/ctf/filtertext.py
diff --git a/ctf/getjs.py b/codegrab/ctf/getjs.py
similarity index 100%
rename from ctf/getjs.py
rename to codegrab/ctf/getjs.py
diff --git a/ctf/guess.py b/codegrab/ctf/guess.py
similarity index 100%
rename from ctf/guess.py
rename to codegrab/ctf/guess.py
diff --git a/ps_.py b/codegrab/ctf/ps_.py
similarity index 100%
rename from ps_.py
rename to codegrab/ctf/ps_.py
diff --git a/search.py b/codegrab/ctf/search.py
similarity index 100%
rename from search.py
rename to codegrab/ctf/search.py
diff --git a/ctf/submit_flag.sh b/codegrab/ctf/submit_flag.sh
similarity index 100%
rename from ctf/submit_flag.sh
rename to codegrab/ctf/submit_flag.sh
diff --git a/ctf/transpose.py b/codegrab/ctf/transpose.py
similarity index 100%
rename from ctf/transpose.py
rename to codegrab/ctf/transpose.py
diff --git a/deploy_timesketch.sh b/codegrab/deploy_timesketch.sh
similarity index 100%
rename from deploy_timesketch.sh
rename to codegrab/deploy_timesketch.sh
diff --git a/depth b/codegrab/depth
similarity index 100%
rename from depth
rename to codegrab/depth
diff --git a/extractfolder.py b/codegrab/extractfolder.py
similarity index 100%
rename from extractfolder.py
rename to codegrab/extractfolder.py
diff --git a/flatpdf.sh b/codegrab/flatpdf.sh
similarity index 100%
rename from flatpdf.sh
rename to codegrab/flatpdf.sh
diff --git a/fritzshark.sh b/codegrab/fritzshark.sh
similarity index 100%
rename from fritzshark.sh
rename to codegrab/fritzshark.sh
diff --git a/fritzshark2.sh b/codegrab/fritzshark2.sh
similarity index 100%
rename from fritzshark2.sh
rename to codegrab/fritzshark2.sh
diff --git a/fuzz.sh b/codegrab/fuzz.sh
similarity index 100%
rename from fuzz.sh
rename to codegrab/fuzz.sh
diff --git a/hashzip.py b/codegrab/hashzip.py
similarity index 100%
rename from hashzip.py
rename to codegrab/hashzip.py
diff --git a/hydrogentest.py b/codegrab/hydrogentest.py
similarity index 100%
rename from hydrogentest.py
rename to codegrab/hydrogentest.py
diff --git a/kv_parse.py b/codegrab/kv_parse.py
similarity index 100%
rename from kv_parse.py
rename to codegrab/kv_parse.py
diff --git a/lpic.sh b/codegrab/lpic.sh
similarity index 100%
rename from lpic.sh
rename to codegrab/lpic.sh
diff --git a/map.awk b/codegrab/map.awk
similarity index 100%
rename from map.awk
rename to codegrab/map.awk
diff --git a/mapping b/codegrab/mapping
similarity index 100%
rename from mapping
rename to codegrab/mapping
diff --git a/matplottest.py b/codegrab/matplottest.py
similarity index 100%
rename from matplottest.py
rename to codegrab/matplottest.py
diff --git a/powershell/getscreen.psm1 b/codegrab/powershell/getscreen.psm1
similarity index 100%
rename from powershell/getscreen.psm1
rename to codegrab/powershell/getscreen.psm1
diff --git a/probability.py b/codegrab/probability.py
similarity index 100%
rename from probability.py
rename to codegrab/probability.py
diff --git a/process_leak.py b/codegrab/process_leak.py
similarity index 100%
rename from process_leak.py
rename to codegrab/process_leak.py
diff --git a/puzzlebox/solution b/codegrab/puzzlebox/solution
similarity index 100%
rename from puzzlebox/solution
rename to codegrab/puzzlebox/solution
diff --git a/puzzlebox/solve.py b/codegrab/puzzlebox/solve.py
similarity index 100%
rename from puzzlebox/solve.py
rename to codegrab/puzzlebox/solve.py
diff --git a/puzzlebox/solve0.py b/codegrab/puzzlebox/solve0.py
similarity index 100%
rename from puzzlebox/solve0.py
rename to codegrab/puzzlebox/solve0.py
diff --git a/puzzlebox/solve2.py b/codegrab/puzzlebox/solve2.py
similarity index 100%
rename from puzzlebox/solve2.py
rename to codegrab/puzzlebox/solve2.py
diff --git a/puzzlebox/solve_mp.py b/codegrab/puzzlebox/solve_mp.py
similarity index 100%
rename from puzzlebox/solve_mp.py
rename to codegrab/puzzlebox/solve_mp.py
diff --git a/puzzlebox/voxels.py b/codegrab/puzzlebox/voxels.py
similarity index 100%
rename from puzzlebox/voxels.py
rename to codegrab/puzzlebox/voxels.py
diff --git a/rootshell.c b/codegrab/rootshell.c
similarity index 100%
rename from rootshell.c
rename to codegrab/rootshell.c
diff --git a/scan_vt.py b/codegrab/scan_vt.py
similarity index 100%
rename from scan_vt.py
rename to codegrab/scan_vt.py
diff --git a/scapy_arp.py b/codegrab/scapy_arp.py
similarity index 100%
rename from scapy_arp.py
rename to codegrab/scapy_arp.py
diff --git a/codegrab/screen2.js b/codegrab/screen2.js
new file mode 100644
index 0000000..59e36c9
--- /dev/null
+++ b/codegrab/screen2.js
@@ -0,0 +1,18 @@
+
+var page = require('webpage').create(),
+url = 'https://mobile.twitter.com/carlomasala1/status/1490645423257706498',
+w = 1920,
+h = 8000
+
+page.viewportSize = { width: w, height: h }
+page.open(url, function(status) {
+if (status !== 'success') {
+    console.log('Unable to load url: ' + url)
+} else {
+    window.setTimeout(function() {
+        page.clipRect = { top: 0, left: 0, width: w, height: h }
+        page.render('img.png')
+        phantom.exit()
+    }, 20000)
+}
+})
diff --git a/screenshot.js b/codegrab/screenshot.js
similarity index 100%
rename from screenshot.js
rename to codegrab/screenshot.js
diff --git a/ps.py b/codegrab/simple_portscan.py
similarity index 100%
rename from ps.py
rename to codegrab/simple_portscan.py
diff --git a/speech.py b/codegrab/speech.py
similarity index 100%
rename from speech.py
rename to codegrab/speech.py
diff --git a/testpw.py b/codegrab/testpw.py
similarity index 100%
rename from testpw.py
rename to codegrab/testpw.py
diff --git a/usbreset.c b/codegrab/usbreset.c
similarity index 100%
rename from usbreset.c
rename to codegrab/usbreset.c
diff --git a/vba_chr_decode.py b/codegrab/vba_chr_decode.py
similarity index 100%
rename from vba_chr_decode.py
rename to codegrab/vba_chr_decode.py
diff --git a/vt_download.py b/codegrab/vt_download.py
similarity index 100%
rename from vt_download.py
rename to codegrab/vt_download.py
diff --git a/vt_ip.py b/codegrab/vt_ip.py
similarity index 100%
rename from vt_ip.py
rename to codegrab/vt_ip.py
diff --git a/vt_pdns.py b/codegrab/vt_pdns.py
similarity index 100%
rename from vt_pdns.py
rename to codegrab/vt_pdns.py
diff --git a/wipe.sh b/codegrab/wipe.sh
similarity index 100%
rename from wipe.sh
rename to codegrab/wipe.sh
diff --git a/youtube_resolve.sh b/codegrab/youtube_resolve.sh
similarity index 100%
rename from youtube_resolve.sh
rename to codegrab/youtube_resolve.sh
diff --git a/README.md b/collected/README.md
similarity index 100%
rename from README.md
rename to collected/README.md
diff --git a/appid.tsv b/collected/appid.tsv
similarity index 100%
rename from appid.tsv
rename to collected/appid.tsv
diff --git a/commands b/collected/commands
similarity index 73%
rename from commands
rename to collected/commands
index 4d65cac..6c706d4 100644
--- a/commands
+++ b/collected/commands
@@ -15,3 +15,9 @@ primes 1 100 |gnuplot -p -e 'plot "/dev/stdin"'
 unshare -r -n w3m
 
 #testedit
+
+#unoconv : Convert office documents back and force
+https://linuxconfig.org/how-to-convert-documents-between-libreoffice-and-microsoft-office-file-formats-on-linux
+
+
+
diff --git a/toollist b/collected/toollist
similarity index 100%
rename from toollist
rename to collected/toollist
diff --git a/bash_aliases b/config/bash_aliases
similarity index 100%
rename from bash_aliases
rename to config/bash_aliases
diff --git a/inputrc b/config/inputrc
similarity index 100%
rename from inputrc
rename to config/inputrc
diff --git a/shell_aliases b/config/shell_aliases
similarity index 89%
rename from shell_aliases
rename to config/shell_aliases
index d5a81c9..a445180 100644
--- a/shell_aliases
+++ b/config/shell_aliases
@@ -3,9 +3,12 @@ alias sless='less -S -R'
 #alias dmcreate='docker-machine create --driver google --google-project crypto-galaxy-182614 --google-zone us-west1-a --google-machine-type f1-micro vm01 ; eval $(docker-machine env vm01)'
 alias dockerstatus="docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock moncho/dry"
 alias dockerip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'"
-alias drit='docker run -i -t --rm'
+alias drit='docker run -i -t --rm '
+alias dritn='docker run -i -t --rm --network=none'
 alias dritpw='docker run -i -t --rm -v "$(mktemp -d):/output" -v "$(pwd)":/data'
 alias dritpwro='docker run -i -t --rm -v "$(mktemp -d):/output" -v "$(pwd)":/data:ro'
+alias dritpwn='docker run -i -t --rm --network=none -v "$(mktemp -d):/output" -v "$(pwd)":/data'
+alias dritpwron='docker run -i -t --rm --network=none -v "$(mktemp -d):/output" -v "$(pwd)":/data:ro'
 alias kali='docker run --rm -it -v ${workdir-`pwd`}:/root/workdir kalilinux/kali-rolling'
 alias lazydocker="docker run --rm -it -v /var/run/docker.sock:/var/run/docker.sock -v /opt/lazydocker:/.config/jesseduffield/lazydocker lazyteam/lazydocker"
 alias mv="mv -vi"
@@ -25,6 +28,8 @@ alias remnux_rekall='docker run --rm -it -p 8000:8000 --dns=192.168.130.1 -v ${w
 alias remnux_thug='sudo docker run --rm -it --dns=192.168.130.1 -v /var/log/docker/thug_logs:/home/thug/logs remnux/thug ./thug.py -F '
 alias remnux_viper='docker run --rm -it --dns=192.168.130.1 -v ${workdir-`pwd`}:/home/nonroot/workdir remnux/viper bash'
 alias remnux_vol='docker run --rm -it -v ${workdir-`pwd`}:/home/nonroot/memdumps remnux/volatility bash'
+alias locate='locate -i -A'
+alias mc='source /usr/lib/mc/mc-wrapper.sh'
 alias evtvd='vd -f csv --skip 5'
 alias rot13='tr "abcdefghijklmnopqrstuvwxyz" "nopqrstuvwxyzabcdefghijklm"'
 alias uniq2='awk '"'"'{a[$0]++; if (a[$0]==1) print $0 }'"'"
@@ -37,4 +42,4 @@ function docker_killall() { docker rm $(docker stop $(docker ps -a -q --filter a
 function dockertags() {     tags=`wget -q https://registry.hub.docker.com/v1/repositories/${1}/tags -O -  | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n'  | awk -F: '{print $3}'`;     if [ -n "$2" ] ; then          tags=` echo "${tags}" | grep "$2" `;     fi ;     echo "${tags}" ;     }
 alias pip='pip3'
 alias python='python3'
-alias usbb="usbguard list-devices -b"
\ No newline at end of file
+alias usbb="usbguard list-devices -b"
diff --git a/visidatarc b/config/visidatarc
similarity index 100%
rename from visidatarc
rename to config/visidatarc
diff --git a/z.sh b/config/z.sh
similarity index 100%
rename from z.sh
rename to config/z.sh
diff --git a/config/zupdate.sh b/config/zupdate.sh
new file mode 100644
index 0000000..9c48257
--- /dev/null
+++ b/config/zupdate.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+[[ -s /home/tke/.bashrc ]] && source /home/tke/.bashrc
+[[ -f ~/.config/z.sh ]] && . ~/.config/z.sh
+
+echo $$ >> /tmp/zupdate.log
+env >> /tmp/zupdate.log
+id >> /tmp/zupdate.log
+cd 
+echo $(pwd) >> /tmp/zupdate.log
+while true ;
+do
+    newfolder=$(inotifywait -e create  /media/data/cases/ | awk '{print $1 $3}')
+    echo "$$ Detected ${newfolder}" >> /tmp/zupdate.log
+    z --add "${newfolder}"
+done
+
diff --git a/read.py b/read.py
deleted file mode 100644
index 129a7fc..0000000
--- a/read.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/python3
-import fileinput
-import sys
-import os
-
-files=set()
-for param in sys.argv[1:]:
-    if os.path.isfile(str(param)):
-#        print(param,"is file")
-        files.add(param)
-#   else:
-#        print(param,"NOT a file")
-
-
-print("all files:", files)
-files.add("-")
-for line in fileinput.input(files if len(files)>0 else "-"):
-    print(fileinput.filename(),":",line)
diff --git a/agnoster.zsh-theme b/systemscripts/agnoster.zsh-theme
similarity index 100%
rename from agnoster.zsh-theme
rename to systemscripts/agnoster.zsh-theme
diff --git a/automountctl b/systemscripts/automountctl
similarity index 100%
rename from automountctl
rename to systemscripts/automountctl
diff --git a/fullhd b/systemscripts/fullhd
similarity index 100%
rename from fullhd
rename to systemscripts/fullhd
diff --git a/mount_container b/systemscripts/mount_container
similarity index 100%
rename from mount_container
rename to systemscripts/mount_container
diff --git a/proxy/get_proxy.sh b/systemscripts/proxy/get_proxy.sh
similarity index 100%
rename from proxy/get_proxy.sh
rename to systemscripts/proxy/get_proxy.sh
diff --git a/proxy/update_apt_proxy.sh b/systemscripts/proxy/update_apt_proxy.sh
similarity index 100%
rename from proxy/update_apt_proxy.sh
rename to systemscripts/proxy/update_apt_proxy.sh
diff --git a/proxy/update_bashrc_proxy.sh b/systemscripts/proxy/update_bashrc_proxy.sh
similarity index 100%
rename from proxy/update_bashrc_proxy.sh
rename to systemscripts/proxy/update_bashrc_proxy.sh
diff --git a/proxy/update_docker_proxy.sh b/systemscripts/proxy/update_docker_proxy.sh
similarity index 100%
rename from proxy/update_docker_proxy.sh
rename to systemscripts/proxy/update_docker_proxy.sh
diff --git a/reset_screens.sh b/systemscripts/reset_screens.sh
similarity index 100%
rename from reset_screens.sh
rename to systemscripts/reset_screens.sh
diff --git a/share.sh b/systemscripts/share.sh
similarity index 100%
rename from share.sh
rename to systemscripts/share.sh
diff --git a/solarized.dircolors b/systemscripts/solarized.dircolors
similarity index 100%
rename from solarized.dircolors
rename to systemscripts/solarized.dircolors
diff --git a/terminal-logs.sh b/systemscripts/terminal-logs.sh
similarity index 100%
rename from terminal-logs.sh
rename to systemscripts/terminal-logs.sh
diff --git a/toggle_display.sh b/systemscripts/toggle_display.sh
similarity index 100%
rename from toggle_display.sh
rename to systemscripts/toggle_display.sh
diff --git a/toggle_touchpad b/systemscripts/toggle_touchpad
similarity index 100%
rename from toggle_touchpad
rename to systemscripts/toggle_touchpad
diff --git a/get b/tools/between
similarity index 100%
rename from get
rename to tools/between
diff --git a/tools/concat.py b/tools/concat.py
new file mode 100644
index 0000000..3f27618
--- /dev/null
+++ b/tools/concat.py
@@ -0,0 +1,16 @@
+#!/usr/bin/python3
+#concats all files and stdin given as arguments and prepends output with filenames
+import fileinput
+import sys
+import os
+
+#remove all non regular files
+sys.argv = [f for f in sys.argv if os.path.isfile(f)]
+
+# if stdin has data add stdin to filelist
+if not sys.stdin.isatty():
+    sys.argv.append("-")
+
+# concat all lines from all files 
+for line in fileinput.input():
+    print(f'{fileinput.filename()}:{line.strip()}')
diff --git a/csv2dot b/tools/csv2dot
similarity index 100%
rename from csv2dot
rename to tools/csv2dot
diff --git a/csv_get b/tools/csv_get
similarity index 100%
rename from csv_get
rename to tools/csv_get
diff --git a/domgrep.py b/tools/domgrep.py
similarity index 100%
rename from domgrep.py
rename to tools/domgrep.py
diff --git a/get_ntp.py b/tools/get_ntp.py
similarity index 100%
rename from get_ntp.py
rename to tools/get_ntp.py
diff --git a/get_stp.sh b/tools/get_stp.sh
similarity index 100%
rename from get_stp.sh
rename to tools/get_stp.sh
diff --git a/geturls.py b/tools/geturls.py
similarity index 100%
rename from geturls.py
rename to tools/geturls.py
diff --git a/ipgrep b/tools/ipgrep
similarity index 100%
rename from ipgrep
rename to tools/ipgrep
diff --git a/mailunpack b/tools/mailunpack
similarity index 100%
rename from mailunpack
rename to tools/mailunpack
diff --git a/noerr b/tools/noerr
similarity index 100%
rename from noerr
rename to tools/noerr
diff --git a/openflattenpdf.sh b/tools/openflattenpdf.sh
similarity index 100%
rename from openflattenpdf.sh
rename to tools/openflattenpdf.sh
diff --git a/quickchardet.py b/tools/quickchardet.py
similarity index 100%
rename from quickchardet.py
rename to tools/quickchardet.py
diff --git a/codegrab/sort.py b/tools/rename.mime.py
similarity index 100%
rename from codegrab/sort.py
rename to tools/rename.mime.py
diff --git a/scatterhash.py b/tools/scatterhash.py
similarity index 100%
rename from scatterhash.py
rename to tools/scatterhash.py
diff --git a/showgm.sh b/tools/showgm.sh
similarity index 100%
rename from showgm.sh
rename to tools/showgm.sh
diff --git a/showosm.sh b/tools/showosm.sh
similarity index 100%
rename from showosm.sh
rename to tools/showosm.sh
diff --git a/tarsum.py b/tools/tarsum.py
similarity index 100%
rename from tarsum.py
rename to tools/tarsum.py
diff --git a/unum.py b/tools/unum.py
similarity index 100%
rename from unum.py
rename to tools/unum.py
diff --git a/urldecode.py b/tools/urldecode.py
similarity index 100%
rename from urldecode.py
rename to tools/urldecode.py
diff --git a/watchgrowth.sh b/tools/watchgrowth.sh
similarity index 100%
rename from watchgrowth.sh
rename to tools/watchgrowth.sh