[TASK] Fix structure packing issues

This version works but no CNs are tested yet.