Updated to support new file structure