diff --git a/app/build.gradle b/app/build.gradle
index 3c66876a2..2e2b17598 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,83 +12,83 @@ if(isRunningOnTravisAndIsNotPRBuild) {
 }
 
 dependencies {
+    // Utils
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
-    implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
-    implementation 'in.yuvi:http.fluent:1.3'
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-
-    implementation 'ch.acra:acra:4.9.2'
-
     implementation 'commons-codec:commons-codec:1.10'
-    implementation 'com.github.pedrovgs:renderers:3.3.3'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.jakewharton.timber:timber:4.4.0'
     implementation 'info.debatty:java-string-similarity:0.24'
-    implementation 'com.borjabravo:readmoretextview:2.1.0'
-
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-
-    implementation 'org.slf4j:slf4j-api:1.7.25'
-    api ("com.github.tony19:logback-android-classic:1.1.1-6") {
-        exclude group: 'com.google.android', module: 'android'
-    }
-
-    implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
-        transitive = true
-    }
-    implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
-
-    //noinspection GradleCompatible
-    implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
-    implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
-    implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
-    implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
-    implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
-    implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
-    kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+    implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.okio:okio:1.14.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    // Because RxAndroid releases are few and far between, it is recommended you also
-
-    // explicitly depend on RxJava's latest version for bug fixes and new features.
     implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1'
     implementation 'com.facebook.fresco:fresco:1.10.0'
-    implementation 'com.facebook.stetho:stetho:1.5.0'
+    
+    // UI
+    implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
+    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.pedrovgs:renderers:3.3.3'
+
+    implementation 'com.borjabravo:readmoretextview:2.1.0'
+    implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
+        transitive = true
+    }
+    implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
+    implementation 'com.dinuscxj:circleprogressbar:1.1.1'
+    implementation 'com.karumi:dexter:5.0.0'
+    implementation files('libs/simplemagic-1.9.jar')
+    implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
+    kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+    
+    // Logging
+    implementation 'ch.acra:acra:4.9.2'
+    implementation 'com.jakewharton.timber:timber:4.4.0'
+    implementation 'org.slf4j:slf4j-api:1.7.25'
+    api ("com.github.tony19:logback-android-classic:1.1.1-6") {
+        exclude group: 'com.google.android', module: 'android'
+    }
+    
+    // Dependency injector
     implementation "com.google.dagger:dagger:$DAGGER_VERSION"
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+    
+    // Unit testing
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:3.7.1'
     testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
-    implementation 'com.dinuscxj:circleprogressbar:1.1.1'
-
-    implementation 'com.tspoon.traceur:traceur:1.0.1'
 
+    // Android testing
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
-    androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIB_VERSION"
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIB_VERSION"
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation "org.mockito:mockito-core:2.10.0"
+    
+    // Debugging
+    implementation 'com.tspoon.traceur:traceur:1.0.1'
+    implementation 'com.facebook.stetho:stetho:1.5.0'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
 
-    androidTestImplementation "org.mockito:mockito-core:2.10.0"
-
-    //For handling runtime permissions
-    implementation 'com.karumi:dexter:5.0.0'
-
-    implementation files('libs/simplemagic-1.9.jar')
+    // Support libraries
+    implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }
 
 android {