75 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 6291f22..25e8f27 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ tmux:
         ln -sf `pwd`/misc/tmux.conf ~/.tmux.conf
 
 crontab:
-        (crontab -l 2>/dev/null; cat tools/cron/* | sed '/^#/ d') | crontab -
+        (crontab -l 2>/dev/null; cat bin/cron/* | sed '/^#/ d') | crontab -
 
 libinput:
         sudo ln -sf `pwd`/misc/libinput/* /etc/X11/xorg.conf.d/
@@ -87,7 +87,7 @@ rofi:
         ln -sf `pwd`/X11/rofi/config.rasi ~/.config/rofi/config.rasi
 
 archcraft:
-        ls -sf `pwd`/tools/desktop/takeshot /usr/local/bin/takeshot
+        ls -sf `pwd`/bin/desktop/takeshot /usr/local/bin/takeshot
 
 urlview:
         ln -sf `pwd`/misc/urlview ~/.urlview
diff --git a/README.md b/README.md
index 03e277f..8843333 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 ## Getting Started
 **via curl**
 ```
-curl -fsS https://raw.githubusercontent.com/typebrook/helper/dev/tools/install.sh | bash
+curl -fsS https://raw.githubusercontent.com/typebrook/helper/dev/bin/install.sh | bash
 
 # Or shorter
 curl -fsSL https://git.io/JUnU7 | bash
 ```
 **via wget**
 ```
-wget -O- https://raw.githubusercontent.com/typebrook/helper/dev/tools/install.sh | bash
+wget -O- https://raw.githubusercontent.com/typebrook/helper/dev/bin/install.sh | bash
 ```
diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index 75406ff..c69e378 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -612,7 +612,7 @@
           -o "window.padding.y=70" 
           -o "window.dimensions.columns=64" 
           -o "window.dimensions.lines=15" 
-          -e ~/helper/tools/misc/flash.sh
+          -e ~/helper/bin/misc/flash.sh
       </command>
       </action>
     </keybind>
diff --git a/alias b/alias
index 17338ea..2b3fa20 100644
--- a/alias
+++ b/alias
@@ -236,7 +236,7 @@ alias gls='git log -S'
 alias cdgg='cd $(git rev-parse --show-toplevel)'
 alias cdgw='cdgg && cd .github/workflows'
 alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" "  -f2)' # cd to first submodule
-alias ch="/home/pham/helper/tools/git/check-repos.sh"
+alias ch="/home/pham/helper/bin/git/check-repos.sh"
 
 # github
 export GITHUB_API='https://api.github.com'
diff --git a/tools/cron/task.cron b/bin/cron/task.cron
index 7521cca..7521cca 100644
--- a/tools/cron/task.cron
+++ b/bin/cron/task.cron
diff --git a/tools/csv/csv.2geojson b/bin/csv/csv.2geojson
index e742be6..e742be6 100755
--- a/tools/csv/csv.2geojson
+++ b/bin/csv/csv.2geojson
diff --git a/tools/csv/csv.move_column b/bin/csv/csv.move_column
index a62701f..a62701f 100755
--- a/tools/csv/csv.move_column
+++ b/bin/csv/csv.move_column
diff --git a/tools/csv/csv.reorder b/bin/csv/csv.reorder
index 8a64239..8a64239 100755
--- a/tools/csv/csv.reorder
+++ b/bin/csv/csv.reorder
diff --git a/tools/desktop/password-store.sh b/bin/desktop/password-store.sh
index 1de3148..1de3148 100755
--- a/tools/desktop/password-store.sh
+++ b/bin/desktop/password-store.sh
diff --git a/tools/desktop/takeshot b/bin/desktop/takeshot
index 09252f3..09252f3 100755
--- a/tools/desktop/takeshot
+++ b/bin/desktop/takeshot
diff --git a/tools/docker/dktags b/bin/docker/dktags
index 5a91434..5a91434 100755
--- a/tools/docker/dktags
+++ b/bin/docker/dktags
diff --git a/tools/gis/match-road.sh b/bin/gis/match-road.sh
index d9beaae..d9beaae 100755
--- a/tools/gis/match-road.sh
+++ b/bin/gis/match-road.sh
diff --git a/tools/git/check-repos.sh b/bin/git/check-repos.sh
index 5180fc9..5180fc9 100755
--- a/tools/git/check-repos.sh
+++ b/bin/git/check-repos.sh
diff --git a/tools/git/swap-protocol.bash b/bin/git/swap-protocol.bash
index b7f4db2..b7f4db2 100755
--- a/tools/git/swap-protocol.bash
+++ b/bin/git/swap-protocol.bash
diff --git a/tools/github/github-release.sh b/bin/github/github-release.sh
index 70ba672..70ba672 100755
--- a/tools/github/github-release.sh
+++ b/bin/github/github-release.sh
diff --git a/tools/gpx/footer b/bin/gpx/footer
index d0759c0..d0759c0 100644
--- a/tools/gpx/footer
+++ b/bin/gpx/footer
diff --git a/tools/gpx/gpx.check.py b/bin/gpx/gpx.check.py
index 10be97c..10be97c 100755
--- a/tools/gpx/gpx.check.py
+++ b/bin/gpx/gpx.check.py
diff --git a/tools/gpx/gpx.merge_gpx.sh b/bin/gpx/gpx.merge_gpx.sh
index 4b024a7..4b024a7 100755
--- a/tools/gpx/gpx.merge_gpx.sh
+++ b/bin/gpx/gpx.merge_gpx.sh
diff --git a/tools/gpx/gpx.merge_trk.sh b/bin/gpx/gpx.merge_trk.sh
index c3a72d4..c3a72d4 100755
--- a/tools/gpx/gpx.merge_trk.sh
+++ b/bin/gpx/gpx.merge_trk.sh
diff --git a/tools/gpx/gpx2geojson.sh b/bin/gpx/gpx2geojson.sh
index eefcf5e..eefcf5e 100755
--- a/tools/gpx/gpx2geojson.sh
+++ b/bin/gpx/gpx2geojson.sh
diff --git a/tools/gpx/header b/bin/gpx/header
index 1912e8b..1912e8b 100644
--- a/tools/gpx/header
+++ b/bin/gpx/header
diff --git a/tools/init/check_upstream b/bin/init/check_upstream
index fa6d277..fa6d277 100755
--- a/tools/init/check_upstream
+++ b/bin/init/check_upstream
diff --git a/tools/init/exit.sh b/bin/init/exit.sh
index 3723670..3723670 100755
--- a/tools/init/exit.sh
+++ b/bin/init/exit.sh
diff --git a/tools/init/load-settings.sh b/bin/init/load-settings.sh
index ff8ba3c..fcd6494 100755
--- a/tools/init/load-settings.sh
+++ b/bin/init/load-settings.sh
@@ -18,7 +18,7 @@ BIN_DIR=$HOME/bin
 PATH=$BIN_DIR:$PATH
 mkdir -p $BIN_DIR
 find $BIN_DIR -xtype l -exec rm {} + 2>/dev/null
-find $SETTING_DIR/tools -type f -executable -exec realpath {} + | \
+find $SETTING_DIR/bin -type f -executable -exec realpath {} + | \
 xargs -I{} ln -sf {} $BIN_DIR
 
 # Mail
diff --git a/tools/init/sync.sh b/bin/init/sync.sh
index bcd7bed..bcd7bed 100755
--- a/tools/init/sync.sh
+++ b/bin/init/sync.sh
diff --git a/tools/install.sh b/bin/install.sh
index 1f1dd86..b6d6bde 100755
--- a/tools/install.sh
+++ b/bin/install.sh
@@ -22,7 +22,7 @@ cat >>$RCFILE <<EOF
 
 # $REPO
 export SETTING_DIR=$SETTING_DIR
-source \$SETTING_DIR/tools/init/load-settings.sh
+source \$SETTING_DIR/bin/init/load-settings.sh
 EOF
 
 cd "$SETTING_DIR" || exit 1
diff --git a/tools/markdown/reveal b/bin/markdown/reveal
index c6bf97b..c6bf97b 100755
--- a/tools/markdown/reveal
+++ b/bin/markdown/reveal
diff --git a/tools/misc/brightness.sh b/bin/misc/brightness.sh
index 4f548f5..4f548f5 100755
--- a/tools/misc/brightness.sh
+++ b/bin/misc/brightness.sh
diff --git a/tools/misc/diff-highlight b/bin/misc/diff-highlight
index 08c88bb..08c88bb 100755
--- a/tools/misc/diff-highlight
+++ b/bin/misc/diff-highlight
diff --git a/tools/misc/flash.sh b/bin/misc/flash.sh
index 93ce8fd..93ce8fd 100755
--- a/tools/misc/flash.sh
+++ b/bin/misc/flash.sh
diff --git a/tools/misc/mvt_decode.py b/bin/misc/mvt_decode.py
index 7c9ac89..7c9ac89 100755
--- a/tools/misc/mvt_decode.py
+++ b/bin/misc/mvt_decode.py
diff --git a/tools/misc/ocr b/bin/misc/ocr
index 26594fe..26594fe 100755
--- a/tools/misc/ocr
+++ b/bin/misc/ocr
diff --git a/tools/misc/refresh-todo.sh b/bin/misc/refresh-todo.sh
index 7931536..7931536 100755
--- a/tools/misc/refresh-todo.sh
+++ b/bin/misc/refresh-todo.sh
diff --git a/tools/misc/simple_cors_server.py b/bin/misc/simple_cors_server.py
index 9d2c898..9d2c898 100755
--- a/tools/misc/simple_cors_server.py
+++ b/bin/misc/simple_cors_server.py
diff --git a/tools/misc/sync-gist.sh b/bin/misc/sync-gist.sh
index 86cca04..86cca04 100755
--- a/tools/misc/sync-gist.sh
+++ b/bin/misc/sync-gist.sh
diff --git a/tools/misc/transfer b/bin/misc/transfer
index 1fc2117..1fc2117 100755
--- a/tools/misc/transfer
+++ b/bin/misc/transfer
diff --git a/tools/osm/josm_install.sh b/bin/osm/josm_install.sh
index 520875a..520875a 100755
--- a/tools/osm/josm_install.sh
+++ b/bin/osm/josm_install.sh
diff --git a/tools/osm/note b/bin/osm/note
index aa51031..aa51031 100644
--- a/tools/osm/note
+++ b/bin/osm/note
diff --git a/tools/osm/osm b/bin/osm/osm
index 344f906..344f906 100644
--- a/tools/osm/osm
+++ b/bin/osm/osm
diff --git a/tools/osm/osm.api.changeset.add b/bin/osm/osm.api.changeset.add
index 3e4878e..3e4878e 100755
--- a/tools/osm/osm.api.changeset.add
+++ b/bin/osm/osm.api.changeset.add
diff --git a/tools/osm/osm.api.changeset.close b/bin/osm/osm.api.changeset.close
index 3b016c3..3b016c3 100755
--- a/tools/osm/osm.api.changeset.close
+++ b/bin/osm/osm.api.changeset.close
diff --git a/tools/osm/osm.api.changeset.commit b/bin/osm/osm.api.changeset.commit
index 6b67833..6b67833 100755
--- a/tools/osm/osm.api.changeset.commit
+++ b/bin/osm/osm.api.changeset.commit
diff --git a/tools/osm/osm.api.changeset.create b/bin/osm/osm.api.changeset.create
index ab9fe85..ab9fe85 100755
--- a/tools/osm/osm.api.changeset.create
+++ b/bin/osm/osm.api.changeset.create
diff --git a/tools/osm/osm.api.changeset.update b/bin/osm/osm.api.changeset.update
index 7267449..7267449 100755
--- a/tools/osm/osm.api.changeset.update
+++ b/bin/osm/osm.api.changeset.update
diff --git a/tools/osm/osm.api.changeset.upload b/bin/osm/osm.api.changeset.upload
index 96bdff4..96bdff4 100755
--- a/tools/osm/osm.api.changeset.upload
+++ b/bin/osm/osm.api.changeset.upload
diff --git a/tools/osm/osm.api.fetch b/bin/osm/osm.api.fetch
index 8460c5f..8460c5f 100755
--- a/tools/osm/osm.api.fetch
+++ b/bin/osm/osm.api.fetch
diff --git a/tools/osm/osm.api.fetch.full b/bin/osm/osm.api.fetch.full
index 5ee78b8..5ee78b8 100755
--- a/tools/osm/osm.api.fetch.full
+++ b/bin/osm/osm.api.fetch.full
diff --git a/tools/osm/osm.api.fetch.history b/bin/osm/osm.api.fetch.history
index bc837bd..bc837bd 100755
--- a/tools/osm/osm.api.fetch.history
+++ b/bin/osm/osm.api.fetch.history
diff --git a/tools/osm/osm.api.member.relation b/bin/osm/osm.api.member.relation
index 5addef7..5addef7 100755
--- a/tools/osm/osm.api.member.relation
+++ b/bin/osm/osm.api.member.relation
diff --git a/tools/osm/osm.api.referenced.relation b/bin/osm/osm.api.referenced.relation
index 2ce0631..2ce0631 100755
--- a/tools/osm/osm.api.referenced.relation
+++ b/bin/osm/osm.api.referenced.relation
diff --git a/tools/osm/osm.api.referenced.way b/bin/osm/osm.api.referenced.way
index 1d84238..1d84238 100755
--- a/tools/osm/osm.api.referenced.way
+++ b/bin/osm/osm.api.referenced.way
diff --git a/tools/osm/osm.api.upload.to b/bin/osm/osm.api.upload.to
index 3979220..3979220 100755
--- a/tools/osm/osm.api.upload.to
+++ b/bin/osm/osm.api.upload.to
diff --git a/tools/osm/osm.file.get b/bin/osm/osm.file.get
index e2b67b4..e2b67b4 100755
--- a/tools/osm/osm.file.get
+++ b/bin/osm/osm.file.get
diff --git a/tools/osm/osm.file.get.full b/bin/osm/osm.file.get.full
index 50ee2f1..50ee2f1 100755
--- a/tools/osm/osm.file.get.full
+++ b/bin/osm/osm.file.get.full
diff --git a/tools/osm/osm.file.query b/bin/osm/osm.file.query
index 4a01b5b..4a01b5b 100755
--- a/tools/osm/osm.file.query
+++ b/bin/osm/osm.file.query
diff --git a/tools/osm/osm.goto b/bin/osm/osm.goto
index 25bceaa..25bceaa 100755
--- a/tools/osm/osm.goto
+++ b/bin/osm/osm.goto
diff --git a/tools/osm/osm.help b/bin/osm/osm.help
index f4c20d2..f4c20d2 100755
--- a/tools/osm/osm.help
+++ b/bin/osm/osm.help
diff --git a/tools/osm/osm.list.ids b/bin/osm/osm.list.ids
index 8e5d870..8e5d870 100755
--- a/tools/osm/osm.list.ids
+++ b/bin/osm/osm.list.ids
diff --git a/tools/osm/osm.list.tag b/bin/osm/osm.list.tag
index 76649a0..76649a0 100755
--- a/tools/osm/osm.list.tag
+++ b/bin/osm/osm.list.tag
diff --git a/tools/osm/osm.list.tags b/bin/osm/osm.list.tags
index 767d32a..767d32a 100755
--- a/tools/osm/osm.list.tags
+++ b/bin/osm/osm.list.tags
diff --git a/tools/osm/osm.member.relation b/bin/osm/osm.member.relation
index f8d4598..f8d4598 100755
--- a/tools/osm/osm.member.relation
+++ b/bin/osm/osm.member.relation
diff --git a/tools/osm/osm.osc.by_member b/bin/osm/osm.osc.by_member
index 5f9d9be..5f9d9be 100755
--- a/tools/osm/osm.osc.by_member
+++ b/bin/osm/osm.osc.by_member
diff --git a/tools/osm/osm.osc.by_tag b/bin/osm/osm.osc.by_tag
index cc92c1d..cc92c1d 100755
--- a/tools/osm/osm.osc.by_tag
+++ b/bin/osm/osm.osc.by_tag
diff --git a/tools/osm/osm.osm.remove b/bin/osm/osm.osm.remove
index 83d6ea8..83d6ea8 100755
--- a/tools/osm/osm.osm.remove
+++ b/bin/osm/osm.osm.remove
diff --git a/tools/osm/osm.pbf.update b/bin/osm/osm.pbf.update
index 6c6f445..6c6f445 100755
--- a/tools/osm/osm.pbf.update
+++ b/bin/osm/osm.pbf.update
diff --git a/tools/osm/osm.query b/bin/osm/osm.query
index 8d0b9f7..8d0b9f7 100755
--- a/tools/osm/osm.query
+++ b/bin/osm/osm.query
diff --git a/tools/osm/sequence_number.sh b/bin/osm/sequence_number.sh
index eb365d0..eb365d0 100755
--- a/tools/osm/sequence_number.sh
+++ b/bin/osm/sequence_number.sh
diff --git a/tools/sns/mastodon.sh b/bin/sns/mastodon.sh
index fb93bcd..fb93bcd 100755
--- a/tools/sns/mastodon.sh
+++ b/bin/sns/mastodon.sh
diff --git a/tools/task/tkk b/bin/task/tkk
index 148d3f6..148d3f6 100755
--- a/tools/task/tkk
+++ b/bin/task/tkk
diff --git a/tools/unix/fdswap b/bin/unix/fdswap
index 251cdea..251cdea 100755
--- a/tools/unix/fdswap
+++ b/bin/unix/fdswap
diff --git a/tools/wiki/diary b/bin/wiki/diary
index 3995ecf..3995ecf 100755
--- a/tools/wiki/diary
+++ b/bin/wiki/diary
diff --git a/tools/wiki/log.sh b/bin/wiki/log.sh
index 4ef2c27..4ef2c27 100755
--- a/tools/wiki/log.sh
+++ b/bin/wiki/log.sh
diff --git a/tools/wiki/notify b/bin/wiki/notify
index 6e510d8..6e510d8 100755
--- a/tools/wiki/notify
+++ b/bin/wiki/notify
diff --git a/vimrc.bak b/vimrc.bak
index 29f34d3..e15d412 100644
--- a/vimrc.bak
+++ b/vimrc.bak
@@ -186,7 +186,7 @@ augroup END
 
 " Generate static pages
 augroup slideRebuild
-  autocmd BufWritePost ~/public/**/slide/*.md :!(cd %:p:h && ~/helper/tools/markdown/reveal %:t >/dev/null &)
+  autocmd BufWritePost ~/public/**/slide/*.md :!(cd %:p:h && ~/helper/bin/markdown/reveal %:t >/dev/null &)
 augroup END
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/zsh/zshrc b/zsh/zshrc
index dece872..0c5c9c0 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -11,7 +11,7 @@ echo '\e[1 q'
 export SETTING_DIR=$HOME/helper
 fpath=($SETTING_DIR/zsh $fpath)
 source $SETTING_DIR/zsh/completion.zsh
-source $SETTING_DIR/tools/init/load-settings.sh
+source $SETTING_DIR/bin/init/load-settings.sh
 
 # Reload zshrc
 alias .="source $ZDOTDIR/.zshrc"
@@ -36,7 +36,7 @@ zstyle ':completion::complete:*' gain-privileges 1
 autoload -Uz add-zsh-hook
 add-zsh-hook precmd precmd
 function precmd() {
-  RIGHT=$(NUM=$($SETTING_DIR/tools/git/check-repos.sh -n); (( $NUM != 0 )) && echo $NUM)
+  RIGHT=$(NUM=$($SETTING_DIR/bin/git/check-repos.sh -n); (( $NUM != 0 )) && echo $NUM)
   PROMPT='%B%(?:%F{green}%m%f:%K{red}%F{black}%m%f%k)%f%F{cyan} %c%f%b '
   RPROMPT="%B%K{red}%F{black}${RIGHT}%f%k%b"
 }