Install refactoring

(not mergable)