I think refolding my fabric was the best thing I could do. It took me a long time to do it but I do the ruler fold method and that tamed my fabric stash tremendously.
I am *almost* contained to the craft room - almost. My yarn got exiled for the most part - it isn't fully gone yet because I haven't finished moving it over. I think once the yarn is completely out of there and in to my personal closet - hubby and I both have our own walk ins - then I'll be better off in the sewing room. I am very grateful to have that room all to my self. It was a prerequisite when we moved here... I had to have my own sewing room :D