Fixing path issues due to file structure change.