Move to engine-like structure