cleanups: tools folder for benchmark.js, consistence naming