refactoring hci-adaptor
Merge branch 'code-refactoring'