Rebuilding all.

Starting to rebuild engine. More modular, more, more, more!