Storing by color is a good idea, I separate out batiks too along with Holiday fabrics. Because of the amount of fabric in my stash I also flat fold everything I also reinforce my shelves. If at all possible place your sewing machine in front of a window for the best possible lighting. It sounds like you will have a lot of fun with your new space.