Refactoring parser and functions into their own org files