-Mostly restruturing and tidying up. Next up: Refatoring AtomicPropositionLabelingParser.h/.cpp Former-commit-id: c26abad850
c26abad850