re-organization for SimpleCore begun