Changed folder management a bit to allow for reading all the folders in one hit