Re-organization of the folder.