Refactoring installer
Work on installer