fixing the folder structure