Replacing hard-coded file hierarchy with preservation of original paths.