Improved structure of CSVLoader and refractored a bunch of things