Reworking upstairs layout

We have been trying to figure out the upstairs layout and how to get some more room for the bathroom (which is the room in the bottom center of the image). You can see that it is pretty small right now and we are looking at being about to add about 16 more square feet to it but is it worth redoing all of the walls? What do you think?

The top picture shows the existing upstairs and the bottom shows the proposed upstairs.