installer refactor

installer refactor