More replacements of libs with path to components