Revert "pre_scramble"

This reverts commit a2ef2fab360e8dab0f55b5dfc6a535aa1ca571b6.
Separate Tool.java, Makefile instead of make.sh, clean up