Change folder structure and changes for matrimony