Consolidated classes into a single file
Merge branch 'master' of https://github.com/Indicative/Android