Properly separate psp.core and psp.std package objects.

"core" is a meaningless name now but we'll get where
we're going.