optimize the folder structure