Updating for v18 build.

File structure for compiler optimization.