Re-organize classes to be a bit more organized

Change-Id: Ie3500c4520a09be28f1856447e66265dd499a680
GitHub: https://github.com/wikimedia/apps-android-commons/pull/36