NX-393: update P2 unpacking process to work with new layout