Purging directories: too many conflicts

Will upload Alberto's most recent after