Removing data directory and fixing CSV columns