I don't bother lining up anything just to store it. I fold it the best way.
I line up the fabric, when I need to cut. Grap the selvages, hold it up and look at the bottom where the crease is....if is is crooked...move the selvages with your fingers until the crease lines up nice...then put it on the tabe and cut the offending piece off and you piece will be straight for you to cut from.