Revert to folder structure changes