New organization for runtime