engine to modules

Bread up engine to modules.