Merged Engine and Modules, fixes