COMMONS-190: unified search - re-organize API package structure