Re-organize folder structure.