Had to refactor things to support both source and package install
Merge branch 'source_install'