Change structure of the framework

Change-Id: I8f388c3a3ce1dee86ba3908c80494aac83e56fd8
Merge branch 'master' of https://github.com/ilzul/bb_app