diff --git a/content/robotics/_index.md b/content/robotics/_index.md
index 7739aaf..7f3f942 100644
--- a/content/robotics/_index.md
+++ b/content/robotics/_index.md
@@ -1,18 +1,3 @@
 ---
-title: Student Robotics
-linktitle: Robotics
-image: https://c2.staticflickr.com/8/7674/17308375182_a172a341d6_h.jpg
+title: Robotics
 ---
-
-Student Robotics is the the place where my development knowledge really started to grow. Thanks to the other people in my team teaching me. I had never done anything robotics related, and so when my computing teacher initially told us about it, I wasn't really interested. After I found out that my friend was also doing it, I signed up, and went along to the kickstart. From then on I was hooked, getting involved with all aspects of the development and design, as well as helping out other teams on the IRC room.
-
-## What is Student Robotics?
-> Student Robotics is a volunteer organisation that runs an annual robotics competition for 16-18 year olds. It was originally founded by students from the University of Southampton in 2006, and now includes volunteers (“Blue Shirts”) from multiple other universities, including the University of Bristol and Grenoble INP. It primarily takes teams and volunteers from the UK, but also some from Germany and France.
-
-There's more information on [their website](https://studentrobotics.org).
-
-## My Entries
-Being at college for 2 years, meant I was able to enter 2 years of competitions, [SR14](2014), and [SR15](2015). We were encouraged to gain an online presence for our team, so I created a basic web page for both years. The original pages have been lost, but the content is all still there.
-
-### Post 2015
-Unfortunately, after I left college, I also left behind entering Student Robotics as a competitor. Fortunately however, [they're always looking for volunteers](https://studentrobotics.org/volunteer/) to help run the competition itself, as a _Blue Shirt_. The college kept on working, and keep [their website](http://robotics.collycomp.uk/) updated.
diff --git a/content/robotics/smallpeice/_index.md b/content/robotics/smallpeice/_index.md
index e1f4725..8d2b41a 100644
--- a/content/robotics/smallpeice/_index.md
+++ b/content/robotics/smallpeice/_index.md
@@ -1,6 +1,5 @@
 ---
 title: Smallpeice
-hide_in_list: true
 ---
 
 Smallpeice is a compressed version of Student Robotics run by the Smallpeice Trust and University of Southampton. Rather than being run over 6 months like Student Robotics, Smallpeice is run over just 5 days.
diff --git a/content/robotics/2014/_index.md b/content/robotics/student-robotics/2014/_index.md
similarity index 100%
rename from content/robotics/2014/_index.md
rename to content/robotics/student-robotics/2014/_index.md
diff --git a/content/robotics/2014/code.md b/content/robotics/student-robotics/2014/code.md
similarity index 100%
rename from content/robotics/2014/code.md
rename to content/robotics/student-robotics/2014/code.md
diff --git a/content/robotics/2014/gallery.md b/content/robotics/student-robotics/2014/gallery.md
similarity index 100%
rename from content/robotics/2014/gallery.md
rename to content/robotics/student-robotics/2014/gallery.md
diff --git a/content/robotics/2014/videos.md b/content/robotics/student-robotics/2014/videos.md
similarity index 100%
rename from content/robotics/2014/videos.md
rename to content/robotics/student-robotics/2014/videos.md
diff --git a/content/robotics/2015/_index.md b/content/robotics/student-robotics/2015/_index.md
similarity index 100%
rename from content/robotics/2015/_index.md
rename to content/robotics/student-robotics/2015/_index.md
diff --git a/content/robotics/2015/code.md b/content/robotics/student-robotics/2015/code.md
similarity index 100%
rename from content/robotics/2015/code.md
rename to content/robotics/student-robotics/2015/code.md
diff --git a/content/robotics/2015/gallery.md b/content/robotics/student-robotics/2015/gallery.md
similarity index 100%
rename from content/robotics/2015/gallery.md
rename to content/robotics/student-robotics/2015/gallery.md
diff --git a/content/robotics/2015/robot.md b/content/robotics/student-robotics/2015/robot.md
similarity index 100%
rename from content/robotics/2015/robot.md
rename to content/robotics/student-robotics/2015/robot.md
diff --git a/content/robotics/2015/videos.md b/content/robotics/student-robotics/2015/videos.md
similarity index 100%
rename from content/robotics/2015/videos.md
rename to content/robotics/student-robotics/2015/videos.md
diff --git a/content/robotics/2016/_index.md b/content/robotics/student-robotics/2016/_index.md
similarity index 100%
rename from content/robotics/2016/_index.md
rename to content/robotics/student-robotics/2016/_index.md
diff --git a/content/robotics/2016/gallery.md b/content/robotics/student-robotics/2016/gallery.md
similarity index 100%
rename from content/robotics/2016/gallery.md
rename to content/robotics/student-robotics/2016/gallery.md
diff --git a/content/robotics/2017/_index.md b/content/robotics/student-robotics/2017/_index.md
similarity index 100%
rename from content/robotics/2017/_index.md
rename to content/robotics/student-robotics/2017/_index.md
diff --git a/content/robotics/2017/first-global.md b/content/robotics/student-robotics/2017/first-global.md
similarity index 100%
rename from content/robotics/2017/first-global.md
rename to content/robotics/student-robotics/2017/first-global.md
diff --git a/content/robotics/2017/gallery.md b/content/robotics/student-robotics/2017/gallery.md
similarity index 100%
rename from content/robotics/2017/gallery.md
rename to content/robotics/student-robotics/2017/gallery.md
diff --git a/content/robotics/student-robotics/_index.md b/content/robotics/student-robotics/_index.md
new file mode 100644
index 0000000..7739aaf
--- /dev/null
+++ b/content/robotics/student-robotics/_index.md
@@ -0,0 +1,18 @@
+---
+title: Student Robotics
+linktitle: Robotics
+image: https://c2.staticflickr.com/8/7674/17308375182_a172a341d6_h.jpg
+---
+
+Student Robotics is the the place where my development knowledge really started to grow. Thanks to the other people in my team teaching me. I had never done anything robotics related, and so when my computing teacher initially told us about it, I wasn't really interested. After I found out that my friend was also doing it, I signed up, and went along to the kickstart. From then on I was hooked, getting involved with all aspects of the development and design, as well as helping out other teams on the IRC room.
+
+## What is Student Robotics?
+> Student Robotics is a volunteer organisation that runs an annual robotics competition for 16-18 year olds. It was originally founded by students from the University of Southampton in 2006, and now includes volunteers (“Blue Shirts”) from multiple other universities, including the University of Bristol and Grenoble INP. It primarily takes teams and volunteers from the UK, but also some from Germany and France.
+
+There's more information on [their website](https://studentrobotics.org).
+
+## My Entries
+Being at college for 2 years, meant I was able to enter 2 years of competitions, [SR14](2014), and [SR15](2015). We were encouraged to gain an online presence for our team, so I created a basic web page for both years. The original pages have been lost, but the content is all still there.
+
+### Post 2015
+Unfortunately, after I left college, I also left behind entering Student Robotics as a competitor. Fortunately however, [they're always looking for volunteers](https://studentrobotics.org/volunteer/) to help run the competition itself, as a _Blue Shirt_. The college kept on working, and keep [their website](http://robotics.collycomp.uk/) updated.
diff --git a/layouts/robotics/list.html b/layouts/robotics/list.html
deleted file mode 100644
index 0ab13ad..0000000
--- a/layouts/robotics/list.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{{ define "main" }}
-<div id="main">
-  <div class="container">
-    {{ partial "content.html" . }}
-
-    {{ if .Content }}<hr />{{ end }}
-
-    {{ $parent := . }}
-    {{ $sorted_pages := sort .Site.Pages (default "Title" .Params.sort_by) (default "asc" .Params.sort_order)}}
-    {{ $valid_pages :=  where $sorted_pages ".Parent" "!=" nil }}
-    {{ $valid_pages :=  where $valid_pages ".Params.hide_in_list" "!=" "true" }}
-    {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }}
-      {{ partial "list_item.html" . }}
-    {{ end }}
-
-    {{ if eq .CurrentSection (.Site.GetPage "section" "robotics") }}
-      <div class="mt-5" />
-      {{ with .Site.GetPage "section" "robotics/smallpeice"}}
-        {{ partial "content.html" . }}
-        <hr />
-        {{ $parent := . }}
-        {{ $sorted_pages := sort .Site.Pages (default "Title" .Params.sort_by) (default "asc" .Params.sort_order)}}
-        {{ $valid_pages :=  where $sorted_pages ".Parent" "!=" nil }}
-        {{ $valid_pages :=  where $valid_pages ".Params.hide_in_list" "!=" "true" }}
-        {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }}
-          {{ partial "list_item.html" . }}
-        {{ end }}
-      {{ end }}
-    {{ end }}
-  </div>
-</div>
-{{ end }}