moved to tools being top-level directories