[SortOfBigCommit] Move pap parser functionality to new files. Add functionality