NTS&B Rearranged shelves on end of room

I am getting a number of Lionel 4x4x0 Americans (Lionel calls them Generals) engines,l which were not fitting well on the way I had the shelves positioned.   I spent a couple days and moved the longer, wider shelf from the left side of the room to the right side, and rearranged most of the contents on the shelves. I now have room for a few more Generals.   Here are a couple pictures.