Refactoring behaviors and adding behavior response support

Change-Id: I999269761c0106163470c03fbd89c08656fcc521
Merge "Refactoring behaviors and adding behavior response support"