Fixing the folder structure