Cleaning up aggregate::Engine code.
Moving aggregate:: module.