Restructure and unpack