3.7.0 changed the layout, so just match the new one
This includes some miscellaneous cleanup to the installer files as well
Untested, probably still needs work