Install refactoring

Fixed this in my `install-from-source` branch.