diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/CustomStreamFetcher.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/CustomStreamFetcher.java
similarity index 75%
rename from app/src/main/java/fr/gouv/etalab/mastodon/client/CustomStreamFetcher.java
rename to app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/CustomStreamFetcher.java
index 155ee38fd..bd3b8739b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/CustomStreamFetcher.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/CustomStreamFetcher.java
@@ -1,30 +1,26 @@
-package fr.gouv.etalab.mastodon.client;
+package fr.gouv.etalab.mastodon.client.Glide;
 
 import android.support.annotation.NonNull;
-import android.util.Log;
 
-import com.bumptech.glide.Glide;
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.model.GlideUrl;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 
-import fr.gouv.etalab.mastodon.helper.Helper;
+import fr.gouv.etalab.mastodon.client.HttpsConnection;
 
 /**
  * Created by Thomas on 13/12/2017.
+ * Custom stream fetcher which will use getPicture from HttpsConnection to get the inputstream
  */
 
 public class CustomStreamFetcher implements DataFetcher<InputStream> {
 
     private GlideUrl url;
 
-    public CustomStreamFetcher(GlideUrl url) {
+    CustomStreamFetcher(GlideUrl url) {
         this.url = url;
     }
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsUrlLoader.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/HttpsUrlLoader.java
similarity index 85%
rename from app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsUrlLoader.java
rename to app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/HttpsUrlLoader.java
index e96d37bb4..c6bc0002a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsUrlLoader.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/HttpsUrlLoader.java
@@ -1,23 +1,19 @@
-package fr.gouv.etalab.mastodon.client;
+package fr.gouv.etalab.mastodon.client.Glide;
 
-import android.content.Context;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
-import com.bumptech.glide.load.model.stream.UrlLoader;
 
 import java.io.InputStream;
 
-import fr.gouv.etalab.mastodon.helper.Helper;
-
 
 /**
  * Created by Thomas on 13/12/2017.
+ * Custom UrlLoader
  */
 
 public class HttpsUrlLoader implements ModelLoader<GlideUrl, InputStream> {
@@ -42,12 +38,10 @@ public class HttpsUrlLoader implements ModelLoader<GlideUrl, InputStream> {
 
     public static class Factory implements ModelLoaderFactory<GlideUrl, InputStream> {
 
-
         @Override
         public ModelLoader<GlideUrl, InputStream> build(MultiModelLoaderFactory multiFactory) {
             return new HttpsUrlLoader();
         }
-
         @Override
         public void teardown() {
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSLibraryGlideModule.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/TLSLibraryGlideModule.java
similarity index 86%
rename from app/src/main/java/fr/gouv/etalab/mastodon/client/TLSLibraryGlideModule.java
rename to app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/TLSLibraryGlideModule.java
index fbed8c37f..72960e688 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/TLSLibraryGlideModule.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Glide/TLSLibraryGlideModule.java
@@ -1,7 +1,6 @@
-package fr.gouv.etalab.mastodon.client;
+package fr.gouv.etalab.mastodon.client.Glide;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
@@ -12,10 +11,9 @@ import com.bumptech.glide.annotation.GlideModule;
 
 import java.io.InputStream;
 
-import fr.gouv.etalab.mastodon.helper.Helper;
-
 /**
  * Created by Thomas on 13/12/2017.
+ * Glide Module to handle https connections with TLSSocketFactory
  */
 
 @GlideModule