Cleanup tool subpackages