When you're organizing your supplies, your goal should be to keep things together you use together. Think about your silverware drawer.
Everything you need to set the table is in one place. Easy.
When you need to put things away, you know exactly where they go. Easy.
Make it easy on yourself to find your supplies AND to put them away again.