Fixed directory structure.

Modified such that the directory structure is the same as the original
file.
Fixed old file.