Folders reorder and fix some bugs