Engine module refactor.