Re-organize the structure.

Summary: