diff --git a/site/data/de/share/1-diaspora.yaml b/site/data/share/de/1-diaspora.yaml
similarity index 100%
rename from site/data/de/share/1-diaspora.yaml
rename to site/data/share/de/1-diaspora.yaml
diff --git a/site/data/de/share/2-gnusocial.yaml b/site/data/share/de/2-gnusocial.yaml
similarity index 100%
rename from site/data/de/share/2-gnusocial.yaml
rename to site/data/share/de/2-gnusocial.yaml
diff --git a/site/data/de/share/3-reddit.yaml b/site/data/share/de/3-reddit.yaml
similarity index 100%
rename from site/data/de/share/3-reddit.yaml
rename to site/data/share/de/3-reddit.yaml
diff --git a/site/data/de/share/4-twitter.yaml b/site/data/share/de/4-twitter.yaml
similarity index 100%
rename from site/data/de/share/4-twitter.yaml
rename to site/data/share/de/4-twitter.yaml
diff --git a/site/data/de/share/5-gplus.yaml b/site/data/share/de/5-gplus.yaml
similarity index 100%
rename from site/data/de/share/5-gplus.yaml
rename to site/data/share/de/5-gplus.yaml
diff --git a/site/data/de/share/6-facebook.yaml b/site/data/share/de/6-facebook.yaml
similarity index 100%
rename from site/data/de/share/6-facebook.yaml
rename to site/data/share/de/6-facebook.yaml
diff --git a/site/data/de/share/7-support.yaml b/site/data/share/de/7-support.yaml
similarity index 100%
rename from site/data/de/share/7-support.yaml
rename to site/data/share/de/7-support.yaml
diff --git a/site/data/en/share/1-diaspora.yaml b/site/data/share/en/1-diaspora.yaml
similarity index 100%
rename from site/data/en/share/1-diaspora.yaml
rename to site/data/share/en/1-diaspora.yaml
diff --git a/site/data/en/share/2-gnusocial.yaml b/site/data/share/en/2-gnusocial.yaml
similarity index 100%
rename from site/data/en/share/2-gnusocial.yaml
rename to site/data/share/en/2-gnusocial.yaml
diff --git a/site/data/en/share/3-reddit.yaml b/site/data/share/en/3-reddit.yaml
similarity index 100%
rename from site/data/en/share/3-reddit.yaml
rename to site/data/share/en/3-reddit.yaml
diff --git a/site/data/en/share/4-twitter.yaml b/site/data/share/en/4-twitter.yaml
similarity index 100%
rename from site/data/en/share/4-twitter.yaml
rename to site/data/share/en/4-twitter.yaml
diff --git a/site/data/en/share/5-gplus.yaml b/site/data/share/en/5-gplus.yaml
similarity index 100%
rename from site/data/en/share/5-gplus.yaml
rename to site/data/share/en/5-gplus.yaml
diff --git a/site/data/en/share/6-facebook.yaml b/site/data/share/en/6-facebook.yaml
similarity index 100%
rename from site/data/en/share/6-facebook.yaml
rename to site/data/share/en/6-facebook.yaml
diff --git a/site/data/en/share/7-support.yaml b/site/data/share/en/7-support.yaml
similarity index 100%
rename from site/data/en/share/7-support.yaml
rename to site/data/share/en/7-support.yaml
diff --git a/site/layouts/partials/sharecolumn.html b/site/layouts/partials/sharecolumn.html
index e96c0b9..15244fc 100644
--- a/site/layouts/partials/sharecolumn.html
+++ b/site/layouts/partials/sharecolumn.html
@@ -1,5 +1,5 @@
 {{ "<!-- SHARE COLUMN -->" | safeHTML }}
-{{ $data := index .Site.Data .Site.Language.Lang }}
+{{ $data := index .Site.Data.share .Site.Language.Lang }}
 <div class="sharecolumn">
   
 <form action="/share" method="GET" class="share-buttons side" target="_blank">
@@ -9,7 +9,7 @@
   <input id="sharetitle-side" name="title" value="{{ .Site.Params.spread.defaultSocialText }}" type="hidden" />
   <input class="n" name="website" placeholder="Please do not put anything here" />
   
-  {{ range $data.share }}
+  {{ range $data }}
     {{ if eq .userinput true }}
       <label class="button share-{{ .id }}" title="{{ .titleBefore}} {{ .name }} {{ .titleAfter  }}" for="{{ .id }}-share-side">&nbsp;</label>
         <input name="popup" id="{{ .id }}-share-side" type="radio" />
@@ -19,9 +19,6 @@
           <button type="submit" name="service" value="{{ .id }}" onclick="return changeTitleSide('{{if isset . "customText"}}{{.customText}}{{else}}{{$.Site.Params.spread.defaultSocialText}}{{end}}')">OK</button>
         </span>
     {{ end }}
-  {{ end }}
-  
-  {{ range $data.share }}
     {{ if ne .userinput true }}
       <button type="submit" name="service" value="{{ .id }}" class="button share-{{ .id }}" title="{{ .titleBefore}} {{ .name }} {{ .titleAfter  }}" onclick="return changeTitleSide('{{if isset . "customText"}}{{.customText}}{{else}}{{$.Site.Params.spread.defaultSocialText}}{{end}}')">&nbsp;</button>
     {{ end }}
diff --git a/site/layouts/partials/spread.html b/site/layouts/partials/spread.html
index 322a38d..8b73537 100644
--- a/site/layouts/partials/spread.html
+++ b/site/layouts/partials/spread.html
@@ -1,5 +1,5 @@
 {{ "<!-- SPREAD -->" | safeHTML }}
-{{ $data := index .Site.Data .Site.Language.Lang }}
+{{ $data := index .Site.Data.share .Site.Language.Lang }}
 <section id="spread" class="bg-dark">
     <div class="container">
         <div class="row">
@@ -26,7 +26,7 @@
                   <input id="sharetitle-spread" name="title" value="{{ .Site.Params.spread.defaultSocialText }}" type="hidden" />
                   <input class="n" name="website" placeholder="Please do not put anything here" />
                   
-                  {{ range $data.share }}
+                  {{ range $data }}
                     {{ if eq .userinput true }}
                       <label class="button share-{{ .id }}" title="{{ .titleBefore}} {{ .name }} {{ .titleAfter  }}" for="{{ .id }}-share-spread">{{ .name }}</label>
                         <input name="popup" id="{{ .id }}-share-spread" type="radio" />
@@ -36,13 +36,11 @@
                           <button type="submit" name="service" value="{{ .id }}" onclick="return changeTitle('{{if isset . "customText"}}{{.customText}}{{else}}{{$.Site.Params.spread.defaultSocialText}}{{end}}')">OK</button>
                         </span>
                     {{ end }}
-                  {{ end }}
-                  
-                  {{ range $data.share }}
                     {{ if ne .userinput true }}
                       <button type="submit" name="service" value="{{ .id }}" class="button share-{{ .id }}" title="{{ .titleBefore}} {{ .name }} {{ .titleAfter  }}" onclick="return changeTitle('{{if isset . "customText"}}{{.customText}}{{else}}{{$.Site.Params.spread.defaultSocialText}}{{end}}')">{{ .name }}</button>
                     {{ end }}
                   {{ end }}
+
                 </form>
               </div>
             </div>