Update namespaces and create CsvTable class.
Remove old files.