REVIEW: NX-156: refactor split packages

https://issues.sonatype.org/browse/NX-156

https://bamboo.zion.sonatype.com/browse/NX-OSSF7-4 :white_check_mark: