diff --git a/_data/general/end_cta.yml b/_data/ctas/end.yml
similarity index 100%
rename from _data/general/end_cta.yml
rename to _data/ctas/end.yml
diff --git a/_data/general/learn_cta.yml b/_data/ctas/learn.yml
similarity index 100%
rename from _data/general/learn_cta.yml
rename to _data/ctas/learn.yml
diff --git a/_data/general/function.yml b/_data/functions/general.yml
similarity index 100%
rename from _data/general/function.yml
rename to _data/functions/general.yml
diff --git a/_layouts/branche.html b/_layouts/branche.html
index 69737b92..1f1e43a8 100644
--- a/_layouts/branche.html
+++ b/_layouts/branche.html
@@ -7,6 +7,6 @@ layout: default
 {% assign data = site.data[page.data] %}
 {% include features.html data=data %}
 
-{% include cta.html cta=site.data.general.learn_cta %}
-{% include functions.html data=site.data.general.function extend=true %}
-{% include cta.html cta=site.data.general.end_cta %}
+{% include cta.html cta=site.data.ctas.learn %}
+{% include functions.html data=site.data.functions.general extend=true %}
+{% include cta.html cta=site.data.ctas.end %}
diff --git a/functions.md b/functions.md
index 4afc8ec2..eb8f5838 100644
--- a/functions.md
+++ b/functions.md
@@ -5,6 +5,6 @@ layout: default
 {% include hero.html title='A wealth of functions' title_2='is provided' image='https://dummyimage.com/860x600' color='by default with InvenTree' detail='By default InvenTree ships with a lot of functions in the area of part, inventory, supplier, manufacturer, machine and BOM managment.
 It also enables reports, is extendible and can be extended with plugins.' %}
 
-{% include functions.html data=site.data.general.function extend=true no_link=true padding=false %}
+{% include functions.html data=site.data.functions.general extend=true no_link=true padding=false %}
 {% include functions.html data=site.data.functions.extras extend=true padding=false %}
-{% include cta.html cta=site.data.general.end_cta %}
+{% include cta.html cta=site.data.ctas.end %}
diff --git a/index.md b/index.md
index 7cf3ec01..81da6120 100644
--- a/index.md
+++ b/index.md
@@ -6,7 +6,7 @@ main_page: True
 
 {% include hero.html title=site.tagline title_2='and more' image='https://dummyimage.com/860x600' color='with InvenTree' detail='Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.' %}
 
-{% include functions.html data=site.data.general.function %}
+{% include functions.html data=site.data.functions.general %}
 
 {% include features.html data=site.data.for_maker link=true %}
 {% include features.html data=site.data.for_business link=true%}
@@ -14,5 +14,5 @@ main_page: True
 
 {% include stats.html data=site.data.general.stats %}
 
-{% include cta.html cta=site.data.general.end_cta %}
+{% include cta.html cta=site.data.ctas.end %}