Re-organize the folder