Minor engine reorganization