简化文件夹结构

Change-Id: Iec0825fcb062782a1b6c787ec143bf7a1ca4e907