Cleanup  - adding subpackages to keep jive-sdk top level directory cleaner