文件结构与页面大修改

Change-Id: Id9484b57ce2f9098b8820872ca430a64526e6807