Directory clean up for build fail.
Readd files for fixing build fail.