I have those drawer isnerts/dividers from ikea, because the drawers we have for bub are huge, so that way I can keep everything seperate even if its all in the same drawer.

For DS, I had it organised pretty uch the way Kazbah has described.