1. Fixed build issues produced from previous commit 2. Create new header files to manage data structures better Change-Id: I704d82c196c1858ed7617d76e40612eb507d2aa0