Reworking to support package manager installs