Moved some tools from savant-dependency-management