folders and photos are now like category and items
tidy up and ready go further