Update the rest of the folders and some cleanup