Modify files and add xctool