I decided that it would be less work to move Mataya to a new room and put the baby in her old room. Doing this meant I only had to paint one room and the crib could just stay where it was.
Mataya was very excited about all of this. She had a nap in her new bed this afternoon and eagerly went to bed this evening. We will see how the night goes.