tools updated to new file structure