I have a cude bookshelf as well with baskets and two plastic five drawer sets. I love those in particular as everything is sorted. THe kids just get the drawer out that they want to play with and then pack away is easy too. I have one for 'food', ponies, lego, potato heads....you get the drift.

All the dolls clothes/paraphernalia are in one of those kids sulo bins, as are the cars and trucks. and I have a small set of shelves with bins for the smaller collections of stuff (plastic animals, musical instruments etc)