Updating for parser changes

Using the new files: parser-matter, parser-path, and extend-file to have consistent parsing. Updating other areas due to changes.

There are places that can be extracted into common files to ensure logic is even more consistent.