Properly rename analyzers
Move CSV-functions to seperate file