Reoarganized engine