Reorganizing Engine Structure