diff --git a/cli/judge.py b/bin/judge.py
old mode 100644
new mode 100755
similarity index 100%
rename from cli/judge.py
rename to bin/judge.py
diff --git a/bin/local-cluster-delete.sh b/tools/local-cluster-delete.sh
similarity index 100%
rename from bin/local-cluster-delete.sh
rename to tools/local-cluster-delete.sh
diff --git a/bin/local-cluster-init.sh b/tools/local-cluster-init.sh
similarity index 50%
rename from bin/local-cluster-init.sh
rename to tools/local-cluster-init.sh
index 569534f..1aa32a8 100755
--- a/bin/local-cluster-init.sh
+++ b/tools/local-cluster-init.sh
@@ -2,29 +2,22 @@ tendermint init --home $HOME/.tendermint/cluster4/1
 tendermint init --home $HOME/.tendermint/cluster4/2
 tendermint init --home $HOME/.tendermint/cluster4/3
 tendermint init --home $HOME/.tendermint/cluster4/4
-# tendermint show_node_id --home $HOME/.tendermint/cluster4/1
-# tendermint show_node_id --home $HOME/.tendermint/cluster4/2
-# tendermint show_node_id --home $HOME/.tendermint/cluster4/3
-# tendermint show_node_id --home $HOME/.tendermint/cluster4/4
-# tendermint show_validator --home $HOME/.tendermint/cluster4/1
-# tendermint show_validator --home $HOME/.tendermint/cluster4/2
-# tendermint show_validator --home $HOME/.tendermint/cluster4/3
-# tendermint show_validator --home $HOME/.tendermint/cluster4/4
+echo "node1: `tendermint show_node_id --home $HOME/.tendermint/cluster4/1`"
+echo "node2: `tendermint show_node_id --home $HOME/.tendermint/cluster4/2`"
+echo "node3: `tendermint show_node_id --home $HOME/.tendermint/cluster4/3`"
+echo "node4: `tendermint show_node_id --home $HOME/.tendermint/cluster4/4`"
 
 TM_VALIDATOR1='{"pub_key":'$(tendermint show_validator --home $HOME/.tendermint/cluster4/1)',"power":10,"name":""}'
 TM_VALIDATOR2='{"pub_key":'$(tendermint show_validator --home $HOME/.tendermint/cluster4/2)',"power":10,"name":""}'
 TM_VALIDATOR3='{"pub_key":'$(tendermint show_validator --home $HOME/.tendermint/cluster4/3)',"power":10,"name":""}'
 TM_VALIDATOR4='{"pub_key":'$(tendermint show_validator --home $HOME/.tendermint/cluster4/4)',"power":10,"name":""}'
 TM_VALIDATORS=$TM_VALIDATOR1,$TM_VALIDATOR2,$TM_VALIDATOR3,$TM_VALIDATOR4
-sed -i -e 's#'$TM_VALIDATOR1'#'$TM_VALIDATORS'#g' $HOME/.tendermint/cluster4/genesis.json
-cp $HOME/.tendermint/cluster4/genesis.json $HOME/.tendermint/cluster4/1/config/genesis.json
-cp $HOME/.tendermint/cluster4/genesis.json $HOME/.tendermint/cluster4/2/config/genesis.json
-cp $HOME/.tendermint/cluster4/genesis.json $HOME/.tendermint/cluster4/3/config/genesis.json
-cp $HOME/.tendermint/cluster4/genesis.json $HOME/.tendermint/cluster4/4/config/genesis.json
+sed -i -e 's#'$TM_VALIDATOR1'#'$TM_VALIDATORS'#g' $HOME/.tendermint/cluster4/1/config/genesis.json
+sed -i -e 's#'$TM_VALIDATOR1'#'$TM_VALIDATORS'#g' $HOME/.tendermint/cluster4/2/config/genesis.json
+sed -i -e 's#'$TM_VALIDATOR1'#'$TM_VALIDATORS'#g' $HOME/.tendermint/cluster4/3/config/genesis.json
+sed -i -e 's#'$TM_VALIDATOR1'#'$TM_VALIDATORS'#g' $HOME/.tendermint/cluster4/4/config/genesis.json
 
 sed -i -e 's#addr_book_strict = true#addr_book_strict = false#g' $HOME/.tendermint/cluster4/1/config/config.toml
 sed -i -e 's#addr_book_strict = true#addr_book_strict = false#g' $HOME/.tendermint/cluster4/2/config/config.toml
 sed -i -e 's#addr_book_strict = true#addr_book_strict = false#g' $HOME/.tendermint/cluster4/3/config/config.toml
 sed -i -e 's#addr_book_strict = true#addr_book_strict = false#g' $HOME/.tendermint/cluster4/4/config/config.toml
-
-export TM_PERSISTENT_PEERS=$(tendermint show_node_id --home $HOME/.tendermint/cluster4/1)"@0.0.0.0:46156,"$(tendermint show_node_id --home $HOME/.tendermint/cluster4/2)"@0.0.0.0:46256,"$(tendermint show_node_id --home $HOME/.tendermint/cluster4/3)"@0.0.0.0:46356,"$(tendermint show_node_id --home $HOME/.tendermint/cluster4/4)"@0.0.0.0:46456"
diff --git a/bin/local-cluster-reset.sh b/tools/local-cluster-reset.sh
similarity index 100%
rename from bin/local-cluster-reset.sh
rename to tools/local-cluster-reset.sh
diff --git a/bin/local-cluster-start.sh b/tools/local-cluster-start.sh
similarity index 60%
rename from bin/local-cluster-start.sh
rename to tools/local-cluster-start.sh
index 8041c72..0ce41f9 100755
--- a/bin/local-cluster-start.sh
+++ b/tools/local-cluster-start.sh
@@ -1,11 +1,19 @@
-screen -d -m -S app1 bash -c 'sbt "run 46158"'
-screen -d -m -S app2 bash -c 'sbt "run 46258"'
-screen -d -m -S app3 bash -c 'sbt "run 46358"'
-screen -d -m -S app4 bash -c 'sbt "run 46458"'
+CWD=`dirname $0`
+
+TM_PERSISTENT_PEERS=\
+$(tendermint show_node_id --home $HOME/.tendermint/cluster4/1)"@0.0.0.0:46156,"\
+$(tendermint show_node_id --home $HOME/.tendermint/cluster4/2)"@0.0.0.0:46256,"\
+$(tendermint show_node_id --home $HOME/.tendermint/cluster4/3)"@0.0.0.0:46356,"\
+$(tendermint show_node_id --home $HOME/.tendermint/cluster4/4)"@0.0.0.0:46456"
+
+screen -d -m -S app1 bash -c "cd $CWD/../tmdemoapp; sbt 'run 46158'"
+screen -d -m -S app2 bash -c "cd $CWD/../tmdemoapp; sbt 'run 46258'"
+screen -d -m -S app3 bash -c "cd $CWD/../tmdemoapp; sbt 'run 46358'"
+screen -d -m -S app4 bash -c "cd $CWD/../tmdemoapp; sbt 'run 46458'"
 
 screen -d -m -S tm1 bash -c 'tendermint node --home=$HOME/.tendermint/cluster4/1 --consensus.create_empty_blocks=false --proxy_app=tcp://127.0.0.1:46158 --rpc.laddr=tcp://0.0.0.0:46157 --p2p.laddr=tcp://0.0.0.0:46156 --p2p.persistent_peers=$TM_PERSISTENT_PEERS'
 screen -d -m -S tm2 bash -c 'tendermint node --home=$HOME/.tendermint/cluster4/2 --consensus.create_empty_blocks=false --proxy_app=tcp://127.0.0.1:46258 --rpc.laddr=tcp://0.0.0.0:46257 --p2p.laddr=tcp://0.0.0.0:46256 --p2p.persistent_peers=$TM_PERSISTENT_PEERS'
 screen -d -m -S tm3 bash -c 'tendermint node --home=$HOME/.tendermint/cluster4/3 --consensus.create_empty_blocks=false --proxy_app=tcp://127.0.0.1:46358 --rpc.laddr=tcp://0.0.0.0:46357 --p2p.laddr=tcp://0.0.0.0:46356 --p2p.persistent_peers=$TM_PERSISTENT_PEERS'
 screen -d -m -S tm4 bash -c 'tendermint node --home=$HOME/.tendermint/cluster4/4 --consensus.create_empty_blocks=false --proxy_app=tcp://127.0.0.1:46458 --rpc.laddr=tcp://0.0.0.0:46457 --p2p.laddr=tcp://0.0.0.0:46456 --p2p.persistent_peers=$TM_PERSISTENT_PEERS'
 
-screen -d -m -S judge bash -c 'python ../cli/judge.py'
+screen -d -m -S judge bash -c "python $CWD/../bin/judge.py"
diff --git a/bin/local-cluster-stop.sh b/tools/local-cluster-stop.sh
similarity index 100%
rename from bin/local-cluster-stop.sh
rename to tools/local-cluster-stop.sh