CM: Install refactor