Re-orgnize the folder