An interim commit. Halfway through the new parser.
Added the removed files, so to speak.