Put the public interfaces in the "core" subpackage to achieve a more consistent packaging/jaring pattern. The separation was artificial and didn't really buy anything.