Don't envy you .. When we moved here (our retirement place), we decided to get rid of stuff. I did but hubs didn't. So I was stuck putting my material into tubs and tubs. Along with boxes of sewing items. We have a large 4 car garage-it sits behind the 2 car garage. So my portion of the garage is my now sewing room. We had boxes galore until he decided to get rid of stuff, and more stuff. Then his parents moved next door, so we have some<correction: alot of their stuff> of their stuff in our sheds as his mom doesn't like clutter at all. So If she cannot get into her garage, stuff goes over to our house.
Anyway .. back to matter at hand: I would fold to 18-19 inches, that will give you a bit of space on the shelves. Then by type, color (while folding by type).
Good luck in your move and HOPEFULLY you will get things sorted out ..