ios - 8 where are the 'camera roll' and 'photostream' albums?

I see the ios8 had done away with the "camera roll" and "photostream" albums and replace them with a "recently added" album. Is there any way to get this old functionality back?

All I want is one folder that contains all the photos on my device and another that contains the photos that I'm happy to share across my devices. I would have hoped I could have create some smart albums, but albums seem to have to be curated manually.

I know I can see all my photos with the photos tab, but there are two issue I have with this, #1 the "collections" interface is horrible – I just want a nice grid of photos like in albums – and #2 my photostream photos are merge within them.

I now have no way of telling if I'm deleting a photo from the phone or the photostream, for example when I'm trying to free up space on the phone.

Would turning on the "icloud photo library" feature help? I would rather not use that as I don't want it to waste all my icloud space.