re-organization for simpleCore begun