Added and Updated Conditional Folders