Bug fixes & directory structure changes.

Signed-off-by: Shindo Wu <cn.shindo@gmail.com>
Bug fixes.

Signed-off-by: Shindo Wu <cn.shindo@gmail.com>