move the tools and libraries closer to each other so they are easier to find and grok