updated file structure
Merge branch 'master' of github.com:cfairchi/Android