Reorganized Installer code to make it easier to work on.