NXDRIVE-159: Refactor packages