RF: refactor to latest terryfy
RF: allow normal pip index for pip installs