reorganize the folder and add teammates work