refine the directories

Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
Merge pull request #2 from acelan/master

General: refine directories and modify make files