Installer - Fix LFI
Installer - Refactor
Ditto - Fix include extenders