We just moved DD from a bassinet in our room into her cot in her own room. I also have a single bed in there as I can't drag myself away from her yet and have her sleep in there in her own. DH gets up really early for work so he sleeps in our room and I sleep in the single bed.
I was exactly the same as you moving beds around and once she arrived I realized I needed the bed in her room and the queen size took up too much space.
I do plan in moving back in DH one day lol