Installer refactoring