Install refactoring

Yeah. I can do this here.