Improve the project structure.

Change-Id: Ic1777249d38ebe829c96fc6f2b267cf8b55d32f4
Revert "Improve the project structure."

This reverts commit db69fb1b3a5d785402fbe8dcc955842c5af11236.