refactoring to use the same architecture that gplus-photohunt-client-android