Working on file parsing

Refactored file names to be generic