Moved things around a bit.

It didn't make sense for tasks to be with the engine includes. They make
use of what the engine provides.