Updating expected Approvals to match \r\n
Creating nested hierarchies correctly
skipping unparseable files
improving console argument handling