Reorganize files and update installer