import installer refactoring from 1.0 branch