repointing all the new tools to new organization