update the folders structure to a more professional way