not sure if you are doing this: BAG AND TAG EVERYTHING!! a lot of screws etc. look very similar but go in specific places - you'll need a box of sandwich baggies, some blue masking tape, a good indelible black marker and several assorted sized boxes.
I didn't do this on my first one and it KILLED me when it was time to put it back together.