Error in file ref name in project
Remove nasty tuple and use custom struct in stead. Much nicer
Fix missing structure definition, move parser token enum into the main parser file.
Cache the classification types after they are converted by the ClassificationTypeRegistry service.
Merge branch 'master' into custom_disp