Reassigning classes; Created CSVStream

Reorganized the way catalog data is loaded and stored
In the middle of creating a CSVStream and fixing consequent errors