Added ability to read from the correct file structure.