Ill confess, i haven't organised this cupboard once since moving in almost 9 months ago. Everything sort of just gets put in there, close the doors and walk away. It is pretty messy for a cleaning supplies cupboard.
I got 2 each of these Kmart coloured handle baskets - Large & Small. I have a basket for items i use daily, sponges/cloths, section for dishwasher items, extra paper towel rolls, basket for all other cleaning products and last basket is floor cleaners. I added a 3m hook to inside the door to hand the dustpan & brush.
The previous under shelf basket whilst a great idea it didn't work for my purpose as it was hard to access cloths. I will find another purpose for it when i continue organising spaces.