Restructure.
Fix tool file.
Fix test