Working on replacing DIF(E)/VIF(E) parser
More changes to how VIF is parsed
Restructure and clean up
Renamed a lot of methods and variables
Added tests