updates to folder & organize