Refine the package

Change-Id: I8d2bd7858741e71f7d2fd4e56f91a8b04a4b9138
Signed-off-by: Zhiguang Li <muzili@gmail.com>