attempt fix folder structure