Folder public reorganized