Reorganize the install