Merge "Move tools to separate directory."