Any way to consolidate camera roll photos

[Jman13]

When I got my 6S, I set up as new (for the first time ever, having carried over restores that started with my 3Gs in 2009). However, with iCloud photo library, my photos carried over right away. This is great. However, it is not ideal when copying an image to my computer...with the iCloud restore, I don't have one camera roll folder, nor two. I have 42. 42 folders for only 174 images (that have been pulled down at the moment). Most folders have one to two images, and that's it. After much trial and error, I found that my current photos from the 6S are in 116Apple (they go from 100Apple to 141Apple.) Is there a way to force the phone to consolidate the photos into one (or two) folders? It's not a copy problem for all the images or anything, but simply annoying when I want to pull one or two specific images off the phone.