Help...

We got Sophia a new twin sized bed yesterday, I know, it is probably child abuse that she has been sleeping in a toddler bed all this time. The reason for this is the extreme smallness of the room that her and Liam share. I really didn't want to put a bigger bed in there, the poor room is cramped enough already. Now with baby sis on the way, I am really trying to organize the heck out of the whole house (a move isn't in our future for about a year?). So... I need toy organization ideas! There are a bunch under the crib that the kids don't play with (since they are under the crib :) I also have 2 baskets full of toys in the living room that I think I would like put away. Their bedroom is about 5 steps from the living room so I expect toys to sneak down the hall, but I have got to somehow make room for all the baby gear that will be coming out of storage in a few months. Any suggestions?!! Liam is at that age where he just pulls crap out and scatters it, and then moves on. The toys are driving me crazy!