rename dirs, add empty lines
fix data errors