merged mods and engine for the Windows installer

closes #4052