Revert to d975270
fixed files/dirs