fixing up directory structure
expanded parser to get more data