reorganized app structure
app structure refinement
Merge branch 'master' of https://github.com/OrgCurrent/Android into keith
pulling from master
Merge branch 'master' into keith