Image Viewer - organize folders and subfolders?

[Beech_55]

I'm using the basic Gallery app to view and organize my photos on my Galaxy Nexus. In preparing to move to the Maxx, I just spent a long time backing up my pictures, both to Google+ and my computer. While connected to the computer, I took the opportunity to reorganize a boatload of folders into a more organized format - 3-4 main folders, with each of those holding various subfolders. I made this change on the device itself. However, when I use the Gallery app on the device, ALL of the folders appear at the same time. Is this a limitation of the app? If so, please recommend an alternative. (And if anyone knows if this isn't an issue with the stock viewer on the Maxx, I'm happy to wait and deal with this issue on the new phone.) Thanks!