added more vim markers
moved identifier replacing to schema class
renamed functions and variables

categorise  > split
parseLine   > parse