Added CoreBox and changed around class packages