When I finally got my room organized just the way I wanted a few years ago, I make myself put everything away when I complete a project. One thing I found very helpful was putting a basket beside my cutting table. After cutting all the fabric I just toss all the scraps in the basket until done...sometimes I have to pull out a fabric to correct a mistake. When project is done, I take the scraps and cut them into 1/2yd, fat qtrs, 10", 8", 5"squares and 2 1/2" strips and put everything in the appropriate container.