Restructure folder tree