Remove redundant library dependency.

Summary:
Reorganize the directory structure.

Summary: