Reorganize directory structure

Change-Id: If618a243012e57e4d53269b8b0e7a3d016007cc2