More renames of files and tools moved into own directory