diff --git a/docs/events/Community/TSC/2016_04_28_pariseventproposal.rst b/docs/events/Community/TSC/2016_04_28_pariseventproposal.rst
new file mode 100644
index 0000000..8f1c14e
--- /dev/null
+++ b/docs/events/Community/TSC/2016_04_28_pariseventproposal.rst
@@ -0,0 +1,23 @@
+.. _2016_04_28_pariseventproposal:
+
+.. toctree::
+
+########################################
+2016 May 31st Paris FD.io event proposal
+########################################
+
+Event
+-----
+
+This presentation was held on May 31st 206.
+
+Speakers
+--------
+
+Pierre Pfister
+
+Presentation
+------------
+
+`Powerpoint <https://wiki.fd.io/images/d/d1/2016_May_Paris_FD.io_Traing_proposal.pptx>`_
+
diff --git a/docs/events/TSCmeeting/index.rst b/docs/events/Community/TSC/index.rst
similarity index 100%
rename from docs/events/TSCmeeting/index.rst
rename to docs/events/Community/TSC/index.rst
diff --git a/docs/events/Community/VPP/2017_04_25_buildingincontainerspoc.rst b/docs/events/Community/VPP/2017_04_25_buildingincontainerspoc.rst
new file mode 100644
index 0000000..b8e0978
--- /dev/null
+++ b/docs/events/Community/VPP/2017_04_25_buildingincontainerspoc.rst
@@ -0,0 +1,22 @@
+.. _2017_04_25_buildingincontainerspoc:
+
+.. toctree::
+
+##########################
+Building In Containers PoC
+##########################
+
+Event
+-----
+
+This presentation was held on April 27, 2017
+
+Speakers
+--------
+
+Ed Kern
+
+Presentation
+------------
+
+`PDF <https://wiki.fd.io/images/a/a8/Building_in_Containers_PoC.pdf>`_
diff --git a/docs/events/VPPCall/index.rst b/docs/events/Community/VPP/index.rst
similarity index 100%
rename from docs/events/VPPCall/index.rst
rename to docs/events/Community/VPP/index.rst
diff --git a/docs/events/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst b/docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
similarity index 68%
rename from docs/events/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
rename to docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
index 116f164..fa72e38 100644
--- a/docs/events/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
+++ b/docs/events/Conferences/CiscoLiveUS/2017_06_26_vppcontainernetwork.rst
@@ -9,7 +9,7 @@
 Event
 -----
 
-This presentation was held during the on June 26th, 2017.
+This presentation was held on June 26th, 2017.
 
 Speakers
 --------
@@ -19,10 +19,4 @@
 Slideshow
 ---------
 
-`Presentation Powerpoint <https://wiki.fd.io/images/7/7b/Cisco_Live_VPP_and_container_networking_%28BRKSDN-2119%29.pptx>`_
-
-Video
------
-
-
-
+`Powerpoint Presentation <https://wiki.fd.io/images/7/7b/Cisco_Live_VPP_and_container_networking_%28BRKSDN-2119%29.pptx>`_
diff --git a/docs/events/CiscoLiveUS/index.rst b/docs/events/Conferences/CiscoLiveUS/index.rst
similarity index 62%
rename from docs/events/CiscoLiveUS/index.rst
rename to docs/events/Conferences/CiscoLiveUS/index.rst
index 3e9b140..14ebbac 100644
--- a/docs/events/CiscoLiveUS/index.rst
+++ b/docs/events/Conferences/CiscoLiveUS/index.rst
@@ -3,10 +3,10 @@
 .. toctree::
 
 #########################
-June 2017 - Cisco Live US 
+June 2017 - Cisco Live US
 #########################
 
 .. toctree::
     :maxdepth: 1
 
-    2017_06_26_vppcontainernetwork.rst    
\ No newline at end of file
+    2017_06_26_vppcontainernetwork.rst
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
new file mode 100644
index 0000000..35d8518
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_introfdio.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_introfdio:
+
+.. toctree::
+
+##############
+Intro to FD.io
+##############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Ed Warnicke
+
+Presentation
+-------------
+
+`Powerpoint <https://wiki.fd.io/images/8/87/Fd.io_intro_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
new file mode 100644
index 0000000..a3202a4
--- /dev/null
+++ b/docs/events/Conferences/Linuxcon/2016_08_24_onelispintro.rst
@@ -0,0 +1,22 @@
+.. _2016_08_24_onelispintro:
+
+.. toctree::
+
+###############
+ONE-LISP Intro
+###############
+
+Event
+-----
+
+This presentation was held on August 24th, 2016.
+
+Speakers
+--------
+
+Florin Coras
+
+Presentation
+------------
+
+`Powerpoint <https://wiki.fd.io/images/3/3e/ONE-LISP_-_Linuxcon_NA_2016.pptx>`_
diff --git a/docs/events/Linuxcon/index.rst b/docs/events/Conferences/Linuxcon/index.rst
similarity index 100%
rename from docs/events/Linuxcon/index.rst
rename to docs/events/Conferences/Linuxcon/index.rst
diff --git a/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst b/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst
new file mode 100644
index 0000000..13f0058
--- /dev/null
+++ b/docs/events/Conferences/OSCON/2017_05_11_40gbpsipsec.rst
@@ -0,0 +1,22 @@
+.. _2017_05_11_40gbpsipsec:
+
+.. toctree::
+
+##################################
+40Gbps IPsec on commodity hardware
+##################################
+
+Event
+-----
+
+This presentation was held on May 11th, 2017.
+
+Speakers
+--------
+
+Jim Thompson
+
+Slideshow
+---------
+
+`PDF <https://wiki.fd.io/images/1/1d/40_Gbps_IPsec_on_commodity_hardware.pdf>`_
diff --git a/docs/events/OSCON/index.rst b/docs/events/Conferences/OSCON/index.rst
similarity index 100%
rename from docs/events/OSCON/index.rst
rename to docs/events/Conferences/OSCON/index.rst
diff --git a/docs/events/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst b/docs/events/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst
deleted file mode 100644
index 127f7d0..0000000
--- a/docs/events/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _2017_07_11_fdiouniversalterabitnetwork:
-
-.. toctree::
-
-############################################
-FD.io: A Universal Terabit Network Dataplane	
-############################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-
-Video
------
-
diff --git a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_benchmarking.rst b/docs/events/FDioMiniSummit/KubeCon/2017_12_5_benchmarking.rst
deleted file mode 100644
index da6c7e3..0000000
--- a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_benchmarking.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2017_12_5_benchmarking:
-
-.. toctree::
-
-#########################################################
-Benchmarking and Analysis of Software Network Data Planes
-#########################################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/IntelSDN/2017_06_13_clearcontainers.rst b/docs/events/IntelSDN/2017_06_13_clearcontainers.rst
deleted file mode 100644
index 2fb8fc5..0000000
--- a/docs/events/IntelSDN/2017_06_13_clearcontainers.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2017_06_13_fdiointeldevsdnnfvdevlab:
-
-.. toctree::
-
-###############################
-Clear Containers + VPP Overview	
-###############################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/IntelSDN/2017_06_13_fdiooverview.rst b/docs/events/IntelSDN/2017_06_13_fdiooverview.rst
deleted file mode 100644
index 445d9ce..0000000
--- a/docs/events/IntelSDN/2017_06_13_fdiooverview.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2017_06_13_fdiointeldevsdnnfvdevlab:
-
-.. toctree::
-
-##############
-FD.io Overview	
-##############
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/Linuxcon/2016_08_24_introfdio.rst b/docs/events/Linuxcon/2016_08_24_introfdio.rst
deleted file mode 100644
index 3de88f4..0000000
--- a/docs/events/Linuxcon/2016_08_24_introfdio.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _2016_08_24_introfdio:
-
-.. toctree::
-
-##############
-Intro to fd.io
-##############
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
diff --git a/docs/events/Linuxcon/2016_08_24_onelispintro.rst b/docs/events/Linuxcon/2016_08_24_onelispintro.rst
deleted file mode 100644
index 540fef6..0000000
--- a/docs/events/Linuxcon/2016_08_24_onelispintro.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_08_24_onelispintro:
-
-.. toctree::
-
-##############
-ONE-LISP Intro	
-##############
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/MeetUps/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst b/docs/events/MeetUps/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst
new file mode 100644
index 0000000..b3df809
--- /dev/null
+++ b/docs/events/MeetUps/FDIOVPPTerabit/2017_07_11_fdiouniversalterabitnetwork.rst
@@ -0,0 +1,22 @@
+.. _2017_07_11_fdiouniversalterabitnetwork:
+
+.. toctree::
+
+############################################
+FD.io: A Universal Terabit Network Dataplane
+############################################
+
+Event
+-----
+
+This presentation was held on July 11, 2017
+
+Speakers
+--------
+
+Maciek Konstantynowicz
+
+Slideshow
+---------
+
+`PDF <https://wiki.fd.io/images/2/24/Fdio-Purley-Demo-v9-mathsfix-pdf.pdf>`_
diff --git a/docs/events/FDIOVPPTerabit/index.rst b/docs/events/MeetUps/FDIOVPPTerabit/index.rst
similarity index 100%
rename from docs/events/FDIOVPPTerabit/index.rst
rename to docs/events/MeetUps/FDIOVPPTerabit/index.rst
diff --git a/docs/events/MeetUps/IntelSDN/2017_06_13_clearcontainers.rst b/docs/events/MeetUps/IntelSDN/2017_06_13_clearcontainers.rst
new file mode 100644
index 0000000..3efd760
--- /dev/null
+++ b/docs/events/MeetUps/IntelSDN/2017_06_13_clearcontainers.rst
@@ -0,0 +1,23 @@
+.. _2017_06_13_fdiointeldevsdnnfvdevlab:
+
+.. toctree::
+
+###############################
+Clear Containers + VPP Overview
+###############################
+
+Event
+-----
+
+This presentation was held on June 13, 2017
+
+Speakers
+--------
+
+Manohar Castelino,
+Eric Erns
+
+Slideshow
+---------
+
+`PDF <https://wiki.fd.io/images/1/16/Clear_Containers%2BVPP-overview-JuneDevLab.pdf>`_
diff --git a/docs/events/MeetUps/IntelSDN/2017_06_13_fdiooverview.rst b/docs/events/MeetUps/IntelSDN/2017_06_13_fdiooverview.rst
new file mode 100644
index 0000000..07d3276
--- /dev/null
+++ b/docs/events/MeetUps/IntelSDN/2017_06_13_fdiooverview.rst
@@ -0,0 +1,23 @@
+.. _2017_06_13_fdiointeldevsdnnfvdevlab:
+
+.. toctree::
+
+##############
+FD.io Overview
+##############
+
+Event
+-----
+
+This presentation was held on June 13, 2017
+
+Speakers
+--------
+
+Jerome Tollet,
+Ed Warnicke
+
+Presentation
+------------
+
+https://wiki.fd.io/images/8/87/Fdio-Intel_Developer_SDN_NFV_Dev_Lab.pptx
diff --git a/docs/events/IntelSDN/index.rst b/docs/events/MeetUps/IntelSDN/index.rst
similarity index 100%
rename from docs/events/IntelSDN/index.rst
rename to docs/events/MeetUps/IntelSDN/index.rst
diff --git a/docs/events/MeetUps/TWS/2016_08_30_introtodpdkcryptoandvpp.rst b/docs/events/MeetUps/TWS/2016_08_30_introtodpdkcryptoandvpp.rst
new file mode 100644
index 0000000..e0b717d
--- /dev/null
+++ b/docs/events/MeetUps/TWS/2016_08_30_introtodpdkcryptoandvpp.rst
@@ -0,0 +1,24 @@
+.. _2016_08_30_introtodpdkcryptoandvpp:
+
+.. toctree::
+
+###################################
+Intro to DPDK Cryptodev and VPP PoC
+###################################
+
+Event
+-----
+
+This presentation was held on August 30, 2016
+
+Speakers
+--------
+
+Tommy Long,
+Sergio Gonzalez Monroy
+
+Slideshow
+---------
+
+`Powerpoint <https://wiki.fd.io/images/2/2a/FDio_Cryptodev_Pres_Final_v2.pptx>`_
+
diff --git a/docs/events/TWSMeeting/index.rst b/docs/events/MeetUps/TWS/index.rst
similarity index 100%
rename from docs/events/TWSMeeting/index.rst
rename to docs/events/MeetUps/TWS/index.rst
diff --git a/docs/events/fdioWebinar/2016_05_25_softwaredataplanes.rst b/docs/events/MeetUps/fdioWebinar/2016_05_25_softwaredataplanes.rst
similarity index 60%
rename from docs/events/fdioWebinar/2016_05_25_softwaredataplanes.rst
rename to docs/events/MeetUps/fdioWebinar/2016_05_25_softwaredataplanes.rst
index 0921aa1..884adc3 100644
--- a/docs/events/fdioWebinar/2016_05_25_softwaredataplanes.rst
+++ b/docs/events/MeetUps/fdioWebinar/2016_05_25_softwaredataplanes.rst
@@ -9,14 +9,15 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on May, 5 2016
 
 Speakers
 --------
 
+Ed Warnicke
+
 Slideshow
 ---------
 
-Video
------
+`Powerpoint <https://wiki.fd.io/images/8/8b/Fdio_is_the_future_of_software_dataplanes_-_v2.pptx>`_
 
diff --git a/docs/events/fdioWebinar/index.rst b/docs/events/MeetUps/fdioWebinar/index.rst
similarity index 100%
rename from docs/events/fdioWebinar/index.rst
rename to docs/events/MeetUps/fdioWebinar/index.rst
diff --git a/docs/events/OSCON/2017_05_11_40gbpsipsec.rst b/docs/events/OSCON/2017_05_11_40gbpsipsec.rst
deleted file mode 100644
index 2c22a57..0000000
--- a/docs/events/OSCON/2017_05_11_40gbpsipsec.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _2017_05_11_40gbpsipsec:
-
-.. toctree::
-
-##################################
-40Gbps IPsec on commodity hardware
-##################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst b/docs/events/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst
deleted file mode 100644
index 3614323..0000000
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_06_21_roadmap:
-
-.. toctree::
-
-#########################################
-Roadmap/Feedback Discussion	
-#########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst b/docs/events/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst
deleted file mode 100644
index 5a5c4d6..0000000
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_06_21_s2_nfvvirtualswitching:
-
-.. toctree::
-
-#########################################
-Session 2 - NFV Virtual Switching	
-#########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst b/docs/events/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst
deleted file mode 100644
index 30434ec..0000000
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-.. _2016_06_21_s3_sdncontroller:
-
-.. toctree::
-
-#########################################
-Session 3 - SDN Controller/Orchestration
-#########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst b/docs/events/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst
deleted file mode 100644
index adaf550..0000000
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_06_21_s4_dataplane:
-
-.. toctree::
-
-#########################################
-Session 4 - Data Plane Acceleration
-#########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst b/docs/events/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst
deleted file mode 100644
index d019bab..0000000
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_06_21_s5_serviceassurance:
-
-.. toctree::
-
-#########################################
-Session 5 - Service Assurance	
-#########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/DPDKSummit/2016/2016_08_10_tldkintro.rst b/docs/events/Summits/DPDKSummit/2016/2016_08_10_tldkintro.rst
similarity index 100%
rename from docs/events/DPDKSummit/2016/2016_08_10_tldkintro.rst
rename to docs/events/Summits/DPDKSummit/2016/2016_08_10_tldkintro.rst
diff --git a/docs/events/DPDKSummit/2016/index.rst b/docs/events/Summits/DPDKSummit/2016/index.rst
similarity index 100%
rename from docs/events/DPDKSummit/2016/index.rst
rename to docs/events/Summits/DPDKSummit/2016/index.rst
diff --git a/docs/events/DPDKSummit/2017/2017_11_15_dpdkvppandpfsense.rst b/docs/events/Summits/DPDKSummit/2017/2017_11_15_dpdkvppandpfsense.rst
similarity index 100%
rename from docs/events/DPDKSummit/2017/2017_11_15_dpdkvppandpfsense.rst
rename to docs/events/Summits/DPDKSummit/2017/2017_11_15_dpdkvppandpfsense.rst
diff --git a/docs/events/DPDKSummit/2017/2017_11_15_vpphoststack.rst b/docs/events/Summits/DPDKSummit/2017/2017_11_15_vpphoststack.rst
similarity index 100%
rename from docs/events/DPDKSummit/2017/2017_11_15_vpphoststack.rst
rename to docs/events/Summits/DPDKSummit/2017/2017_11_15_vpphoststack.rst
diff --git a/docs/events/DPDKSummit/2017/index.rst b/docs/events/Summits/DPDKSummit/2017/index.rst
similarity index 100%
rename from docs/events/DPDKSummit/2017/index.rst
rename to docs/events/Summits/DPDKSummit/2017/index.rst
diff --git a/docs/events/DPDKSummit/index.rst b/docs/events/Summits/DPDKSummit/index.rst
similarity index 100%
rename from docs/events/DPDKSummit/index.rst
rename to docs/events/Summits/DPDKSummit/index.rst
diff --git a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_VPPHost.rst b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_VPPHost.rst
similarity index 63%
rename from docs/events/FDioMiniSummit/KubeCon/2017_12_5_VPPHost.rst
rename to docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_VPPHost.rst
index 23a48c7..031ab75 100644
--- a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_VPPHost.rst
+++ b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_VPPHost.rst
@@ -3,7 +3,7 @@
 .. toctree::
 
 ##############
-VPP Host Stack	
+VPP Host Stack
 ##############
 
 Event
@@ -14,10 +14,9 @@
 Speakers
 --------
 
+Florin Coras
 
-Slideshow
----------
+Presentation
+------------
 
-Video
------
-
+`PDF <https://wiki.fd.io/images/b/b4/Vpp-hoststack-kc.pdf>`_
diff --git a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_armrallying.rst b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_armrallying.rst
similarity index 60%
rename from docs/events/FDioMiniSummit/KubeCon/2017_12_5_armrallying.rst
rename to docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_armrallying.rst
index aed7ef3..3fad36f 100644
--- a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_armrallying.rst
+++ b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_armrallying.rst
@@ -9,16 +9,13 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on December 5th, 2017.
 
 Speakers
 --------
-
+Tina Tsou
 
 Slideshow
 ---------
 
-Video
------
-
-
+`PDF <https://wiki.fd.io/images/4/4e/Arm_Rallying_the_Ecosystem_Around_FD.io.pdf>`_
diff --git a/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_benchmarking.rst b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_benchmarking.rst
new file mode 100644
index 0000000..de1c3b8
--- /dev/null
+++ b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_benchmarking.rst
@@ -0,0 +1,24 @@
+.. _2017_12_5_benchmarking:
+
+.. toctree::
+
+#########################################################
+Benchmarking and Analysis of Software Network Data Planes
+#########################################################
+
+Event
+-----
+
+This presentation was held on December 12th, 2017.
+
+Speakers
+--------
+
+Maciek Konstantynowicz
+Patrick Lu
+Shrikant Shah
+
+Presentation
+------------
+
+`PDF <https://wiki.fd.io/images/3/31/Benchmarking-sw-data-planes-Dec5_2017.pdf>`_
diff --git a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_empoweringuserspacestack.rst b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_empoweringuserspacestack.rst
similarity index 68%
rename from docs/events/FDioMiniSummit/KubeCon/2017_12_5_empoweringuserspacestack.rst
rename to docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_empoweringuserspacestack.rst
index 01a3293..a7966ba 100644
--- a/docs/events/FDioMiniSummit/KubeCon/2017_12_5_empoweringuserspacestack.rst
+++ b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/2017_12_5_empoweringuserspacestack.rst
@@ -9,16 +9,14 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on December 12th, 2017.
 
 Speakers
 --------
 
+George Zhao
 
 Slideshow
 ---------
 
-Video
------
-
-
+`PDF <https://wiki.fd.io/images/6/6f/FDIO_Mini_Summit_Dec_2017.pdf>`_
diff --git a/docs/events/FDioMiniSummit/KubeCon/index.rst b/docs/events/Summits/FDioMiniSummit/KubeCon_2017/index.rst
similarity index 100%
rename from docs/events/FDioMiniSummit/KubeCon/index.rst
rename to docs/events/Summits/FDioMiniSummit/KubeCon_2017/index.rst
diff --git a/docs/events/FDioMiniSummit/atOSS/2017_05_10_performanceconsideration.rst b/docs/events/Summits/FDioMiniSummit/OSS_2017/2017_05_10_performanceconsideration.rst
similarity index 100%
rename from docs/events/FDioMiniSummit/atOSS/2017_05_10_performanceconsideration.rst
rename to docs/events/Summits/FDioMiniSummit/OSS_2017/2017_05_10_performanceconsideration.rst
diff --git a/docs/events/FDioMiniSummit/atOSS/index.rst b/docs/events/Summits/FDioMiniSummit/OSS_2017/index.rst
similarity index 100%
rename from docs/events/FDioMiniSummit/atOSS/index.rst
rename to docs/events/Summits/FDioMiniSummit/OSS_2017/index.rst
diff --git a/docs/events/FDioMiniSummit/index.rst b/docs/events/Summits/FDioMiniSummit/index.rst
similarity index 64%
rename from docs/events/FDioMiniSummit/index.rst
rename to docs/events/Summits/FDioMiniSummit/index.rst
index cd46bd0..938d433 100644
--- a/docs/events/FDioMiniSummit/index.rst
+++ b/docs/events/Summits/FDioMiniSummit/index.rst
@@ -7,7 +7,6 @@
 #################
 
 .. toctree::
-    :maxdepth: 2
 
-    KubeCon/index.rst
-    atOSS/index.rst
\ No newline at end of file
+   KubeCon_2017/index.rst
+   OSS_2017/index.rst
diff --git a/docs/events/OpNFV/OPNFVCSIT/2017_02_01_fdiocsitoverview.rst b/docs/events/Summits/OpNFV/OPNFVCSIT/2017_02_01_fdiocsitoverview.rst
similarity index 100%
rename from docs/events/OpNFV/OPNFVCSIT/2017_02_01_fdiocsitoverview.rst
rename to docs/events/Summits/OpNFV/OPNFVCSIT/2017_02_01_fdiocsitoverview.rst
diff --git a/docs/events/OpNFV/OPNFVCSIT/index.rst b/docs/events/Summits/OpNFV/OPNFVCSIT/index.rst
similarity index 100%
rename from docs/events/OpNFV/OPNFVCSIT/index.rst
rename to docs/events/Summits/OpNFV/OPNFVCSIT/index.rst
diff --git a/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst
new file mode 100644
index 0000000..ebd76cf
--- /dev/null
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_roadmap.rst
@@ -0,0 +1,22 @@
+.. _2016_06_21_roadmap:
+
+.. toctree::
+
+###########################
+Roadmap/Feedback Discussion
+###########################
+
+Event
+-----
+
+This presentation was held on June 21, 2016
+
+Speakers
+--------
+
+Chris Donley
+
+Slideshow
+---------
+
+`Powerpoint <https://wiki.fd.io/images/e/e0/Roadmap_Feedback_Discussion.pptx>`_
diff --git a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst
similarity index 61%
rename from docs/events/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst
rename to docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst
index 561c665..155a614 100644
--- a/docs/events/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s1_introduction.rst
@@ -9,15 +9,15 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on June 21, 2016
 
 Speakers
 --------
 
+Ed Warnicke,
+Tim O'Driscoll
 
 Slideshow
 ---------
 
-Video
------
-
+`Powerpoint <https://wiki.fd.io/images/8/81/Introductory_Session.pptx>`_
diff --git a/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst
new file mode 100644
index 0000000..00b481d
--- /dev/null
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s2_nfvvirtualswitching.rst
@@ -0,0 +1,24 @@
+.. _2016_06_21_s2_nfvvirtualswitching:
+
+.. toctree::
+
+#########################################
+Session 2 - NFV Virtual Switching	
+#########################################
+
+Event
+-----
+
+This presentation was held on June 21, 2016
+
+Speakers
+--------
+
+Thomas F Herbert,
+Mark Gray,
+Chris Price
+
+Slideshow
+---------
+
+`Powerpoint <https://wiki.fd.io/images/8/8c/NFV_vSwitch_Requirements.pptx>`_
diff --git a/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst
new file mode 100644
index 0000000..3530496
--- /dev/null
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s3_sdncontroller.rst
@@ -0,0 +1,23 @@
+.. _2016_06_21_s3_sdncontroller:
+
+.. toctree::
+
+#########################################
+Session 3 - SDN Controller/Orchestration
+#########################################
+
+Event
+-----
+
+This presentation was held on June 21, 2016
+
+Speakers
+--------
+
+Joel Halpern,
+Frank Brockners
+
+Presentation
+------------
+
+`Powerpoint <https://wiki.fd.io/images/2/2a/SDN_Controller_Orchestration.pptx>`_
diff --git a/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst
new file mode 100644
index 0000000..3c368bd
--- /dev/null
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s4_dataplane.rst
@@ -0,0 +1,22 @@
+.. _2016_06_21_s4_dataplane:
+
+.. toctree::
+
+###################################
+Session 4 - Data Plane Acceleration
+###################################
+
+Event
+-----
+
+This presentation was held on June 21, 2016
+
+Speakers
+--------
+
+Keith Wiles
+
+Slideshow
+---------
+
+`Powerpoint <https://wiki.fd.io/images/4/4c/Data_Acceleration.pptx>`_
diff --git a/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst
new file mode 100644
index 0000000..b25c03b
--- /dev/null
+++ b/docs/events/Summits/OpNFV/OPNFVSummit/2016_06_21_s5_serviceassurance.rst
@@ -0,0 +1,24 @@
+.. _2016_06_21_s5_serviceassurance:
+
+.. toctree::
+
+#############################
+Session 5 - Service Assurance
+#############################
+
+Event
+-----
+
+This presentation was held on June 21, 2016
+
+Speakers
+--------
+
+Carlos Goncalves,
+Maryam Tahhan
+
+Slideshow
+---------
+
+`Powerpoint <https://wiki.fd.io/images/7/76/Service_Assurance.pptx>`_
+
diff --git a/docs/events/OpNFV/OPNFVSummit/index.rst b/docs/events/Summits/OpNFV/OPNFVSummit/index.rst
similarity index 100%
rename from docs/events/OpNFV/OPNFVSummit/index.rst
rename to docs/events/Summits/OpNFV/OPNFVSummit/index.rst
diff --git a/docs/events/OpNFV/OpNFVtechnicalwork/2016_03_30_IntroFdio.rst b/docs/events/Summits/OpNFV/OpNFVtechnicalwork/2016_03_30_IntroFdio.rst
similarity index 100%
rename from docs/events/OpNFV/OpNFVtechnicalwork/2016_03_30_IntroFdio.rst
rename to docs/events/Summits/OpNFV/OpNFVtechnicalwork/2016_03_30_IntroFdio.rst
diff --git a/docs/events/OpNFV/OpNFVtechnicalwork/index.rst b/docs/events/Summits/OpNFV/OpNFVtechnicalwork/index.rst
similarity index 100%
rename from docs/events/OpNFV/OpNFVtechnicalwork/index.rst
rename to docs/events/Summits/OpNFV/OpNFVtechnicalwork/index.rst
diff --git a/docs/events/OpNFV/index.rst b/docs/events/Summits/OpNFV/index.rst
similarity index 100%
rename from docs/events/OpNFV/index.rst
rename to docs/events/Summits/OpNFV/index.rst
diff --git a/docs/events/OpenDaylight/2016_02_29_fdioandhoneycomb.rst b/docs/events/Summits/OpenDaylight/2016_02_29_fdioandhoneycomb.rst
similarity index 100%
rename from docs/events/OpenDaylight/2016_02_29_fdioandhoneycomb.rst
rename to docs/events/Summits/OpenDaylight/2016_02_29_fdioandhoneycomb.rst
diff --git a/docs/events/OpenDaylight/2016_02_29_fdiointro.rst b/docs/events/Summits/OpenDaylight/2016_02_29_fdiointro.rst
similarity index 100%
rename from docs/events/OpenDaylight/2016_02_29_fdiointro.rst
rename to docs/events/Summits/OpenDaylight/2016_02_29_fdiointro.rst
diff --git a/docs/events/OpenDaylight/index.rst b/docs/events/Summits/OpenDaylight/index.rst
similarity index 100%
rename from docs/events/OpenDaylight/index.rst
rename to docs/events/Summits/OpenDaylight/index.rst
diff --git a/docs/events/OpenNetworkSummit/2016_03_15_fdiofuture.rst b/docs/events/Summits/OpenNetworkSummit/2016_03_15_fdiofuture.rst
similarity index 100%
rename from docs/events/OpenNetworkSummit/2016_03_15_fdiofuture.rst
rename to docs/events/Summits/OpenNetworkSummit/2016_03_15_fdiofuture.rst
diff --git a/docs/events/OpenNetworkSummit/2016_03_15_introfdio.rst b/docs/events/Summits/OpenNetworkSummit/2016_03_15_introfdio.rst
similarity index 100%
rename from docs/events/OpenNetworkSummit/2016_03_15_introfdio.rst
rename to docs/events/Summits/OpenNetworkSummit/2016_03_15_introfdio.rst
diff --git a/docs/events/OpenNetworkSummit/2016_03_17_PacketProcess.rst b/docs/events/Summits/OpenNetworkSummit/2016_03_17_PacketProcess.rst
similarity index 100%
rename from docs/events/OpenNetworkSummit/2016_03_17_PacketProcess.rst
rename to docs/events/Summits/OpenNetworkSummit/2016_03_17_PacketProcess.rst
diff --git a/docs/events/OpenNetworkSummit/index.rst b/docs/events/Summits/OpenNetworkSummit/index.rst
similarity index 100%
rename from docs/events/OpenNetworkSummit/index.rst
rename to docs/events/Summits/OpenNetworkSummit/index.rst
diff --git a/docs/events/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst b/docs/events/Summits/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst
similarity index 66%
rename from docs/events/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst
rename to docs/events/Summits/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst
index a596ebd..c74cbf1 100644
--- a/docs/events/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst
+++ b/docs/events/Summits/OpensourceSummit/2017_09_13_theuniversalnetworkdataplane.rst
@@ -9,14 +9,14 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on September, 9 2017.
 
 Speakers
 --------
 
+Ed Warnicke
 
 Slideshow
 ---------
 
-Video
------
+`Powerpoint <https://wiki.fd.io/images/7/75/FD.io_-_OSS_-_2017-09-13.pptx>`_
diff --git a/docs/events/OpensourceSummit/index.rst b/docs/events/Summits/OpensourceSummit/index.rst
similarity index 100%
rename from docs/events/OpensourceSummit/index.rst
rename to docs/events/Summits/OpensourceSummit/index.rst
diff --git a/docs/events/UKNO/2017_04_30_buildingbespokesoftdataplane.rst b/docs/events/Summits/UKNO/2017_04_30_buildingbespokesoftdataplane.rst
similarity index 64%
rename from docs/events/UKNO/2017_04_30_buildingbespokesoftdataplane.rst
rename to docs/events/Summits/UKNO/2017_04_30_buildingbespokesoftdataplane.rst
index 66a02ca..abd36a7 100644
--- a/docs/events/UKNO/2017_04_30_buildingbespokesoftdataplane.rst
+++ b/docs/events/Summits/UKNO/2017_04_30_buildingbespokesoftdataplane.rst
@@ -9,15 +9,14 @@
 Event
 -----
 
-This presentation was held during the on  th, 201.
+This presentation was held on April 30, 2017
 
 Speakers
 --------
 
+Maciek Konstantynowicz
 
-Slideshow
----------
+Presentation
+------------
 
-Video
------
-
+`Powerpoint <https://wiki.fd.io/images/1/12/Uknof37_Fdio.pptx>`_
diff --git a/docs/events/UKNO/index.rst b/docs/events/Summits/UKNO/index.rst
similarity index 100%
rename from docs/events/UKNO/index.rst
rename to docs/events/Summits/UKNO/index.rst
diff --git a/docs/events/TLDKCall/2016_11_18_tcptimers.rst b/docs/events/TLDKCall/2016_11_18_tcptimers.rst
deleted file mode 100644
index b660c31..0000000
--- a/docs/events/TLDKCall/2016_11_18_tcptimers.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_11_18_tcptimers:
-
-.. toctree::
-
-#################################
-TCP timer implementation overview
-#################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/TLDKCall/index.rst b/docs/events/TLDKCall/index.rst
deleted file mode 100644
index e069f2b..0000000
--- a/docs/events/TLDKCall/index.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. _TLDKCall:
-
-.. toctree::
-
-#########################
-2016 November - TLDK Call
-#########################
-
-.. toctree::
-    :maxdepth: 1
-    
-    2016_11_18_tcptimers.rst
-
-    
-
-    
\ No newline at end of file
diff --git a/docs/events/TSCmeeting/2016_04_28_pariseventproposal.rst b/docs/events/TSCmeeting/2016_04_28_pariseventproposal.rst
deleted file mode 100644
index 85bd57c..0000000
--- a/docs/events/TSCmeeting/2016_04_28_pariseventproposal.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2016_04_28_pariseventproposal:
-
-.. toctree::
-
-########################################
-2016 May 31st Paris FD.io event proposal
-########################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/TWSMeeting/2016_08_30_introtodpdkcryptoandvpp.rst b/docs/events/TWSMeeting/2016_08_30_introtodpdkcryptoandvpp.rst
deleted file mode 100644
index 33246d1..0000000
--- a/docs/events/TWSMeeting/2016_08_30_introtodpdkcryptoandvpp.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _2016_08_30_introtodpdkcryptoandvpp:
-
-.. toctree::
-
-###################################
-Intro to DPDK Cryptodev and VPP PoC
-###################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/VPPCall/2017_04_25_buildingincontainerspoc.rst b/docs/events/VPPCall/2017_04_25_buildingincontainerspoc.rst
deleted file mode 100644
index c72c5b1..0000000
--- a/docs/events/VPPCall/2017_04_25_buildingincontainerspoc.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _2017_04_25_buildingincontainerspoc:
-
-.. toctree::
-
-##########################
-Building In Containers PoC	
-##########################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/fdioTraining/2016_04_05_faster.rst b/docs/events/fdioTraining/2016_04_05_faster.rst
deleted file mode 100644
index 075b972..0000000
--- a/docs/events/fdioTraining/2016_04_05_faster.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _2016_04_05_faster:
-
-.. toctree:
-
-======
-Faster
-======
-
-Event
------
-
-This presentation was held during the FD.io Training/Hackfest on April 5th, 2016.
-
-Speakers
---------
-
-Dave Ward
-
-Slideshow
----------
-
-`Presentation Powerpoint <https://wiki.fd.io/images/4/42/Fdio_Ward_-_2016-04-05.pptx>`_
-
-Video
------
-
-`Dave Ward's Video Presentation <https://www.youtube.com/watch?v=_gpjwQHOGwE>`_
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-1-mapinvpp.rst b/docs/events/fdioTraining/AllTrainingContent/DayFour/4-1-mapinvpp.rst
deleted file mode 100644
index 298b6da..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-1-mapinvpp.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _4-1-mapinvpp:
-
-.. toctree::
-
-##############################
-FD.io DevBoot: 4.1: Map in VPP
-##############################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-2-project-onelisp.rst b/docs/events/fdioTraining/AllTrainingContent/DayFour/4-2-project-onelisp.rst
deleted file mode 100644
index 8d4dcaf..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-2-project-onelisp.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. _4-2-project-onelisp:
-
-.. toctree::
-
-#####################################
-FD.io DevBoot: 4.2: Project: ONE LISP
-#####################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-3-csit-performancetesting.rst b/docs/events/fdioTraining/AllTrainingContent/DayFour/4-3-csit-performancetesting.rst
deleted file mode 100644
index 5c59f09..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayFour/4-3-csit-performancetesting.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _4-3-csit-performancetesting:
-
-.. toctree::
-
-#############################################
-FD.io DevBoot: 4.3 CSIT + Performance testing
-#############################################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayFour/index.rst b/docs/events/fdioTraining/AllTrainingContent/DayFour/index.rst
deleted file mode 100644
index eaf58cd..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayFour/index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. _DayFour:
-
-.. toctree::
-
-########
-Day Four
-########
-
-.. toctree::
-    :maxdepth: 1
-    
-    4-1-mapinvpp.rst
-    4-2-project-onelisp.rst
-    4-3-csit-performancetesting.rst
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-2-vppoverview.rst b/docs/events/fdioTraining/AllTrainingContent/DayOne/1-2-vppoverview.rst
deleted file mode 100644
index ea9f69f..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-2-vppoverview.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _1-2-vppoverview:
-
-.. toctree::
-
-===============================
-FD.io DevBoot: 1.2 VPP overview
-===============================
-
-Event
------
-
-This presentation was held during the FD.io Training/Hackfest on April 5th, 2016.
-
-Speakers
---------
-
-Dave Barach and Keith Burns
-
-Slideshow
----------
-
-`Presentation Powerpoint <https://docs.google.com/presentation/d/1w5r7OrZtmspaYO6Vgo84g9L1-bOHmX_8hEZnaA99_ds/pub?start=false&loop=false&delayms=3000&slide=id.p1>`_
-
-Video
------
-
-`DevBoot Presentation <https://www.youtube.com/watch?v=9Bk9pj71qWY>`_
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-3-containerdemo.rst b/docs/events/fdioTraining/AllTrainingContent/DayOne/1-3-containerdemo.rst
deleted file mode 100644
index d219d95..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-3-containerdemo.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. _1-3-containerdemo:
-
-.. toctree::
-
-=================================
-FD.io DevBoot: 1.3 Container Demo
-=================================
-
-Event
------
-
-This presentation was held during the FD.io Training/Hackfest on April 5th, 2016.
-
-Speakers
---------
-
-Nikos Bregiannis
-
-
-Slideshow
----------
-
-`Presentation Powerpoint <https://docs.google.com/presentation/d/1JL5O_ZkRUXVaY4ZuKaMj13jEGv90eanOYAB7mHfmPK4/pub?start=false&loop=false&delayms=3000&slide=id.p1>`_
-
-Video
------
-
-`DevBoot Presentation <https://www.youtube.com/watch?v=z472oR-Z8zM>`_
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-4-codecontributionmechanics.rst b/docs/events/fdioTraining/AllTrainingContent/DayOne/1-4-codecontributionmechanics.rst
deleted file mode 100644
index 053490a..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-4-codecontributionmechanics.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _1-4-codecontributionmechanics:
-
-.. toctree::
-
-==============================================
-FD.io DevBoot: 1.4 Code Contribution Mechanics
-==============================================
-
-Event
------
-
-This presentation was held during the FD.io Training/Hackfest on April 5th, 2016.
-
-Speakers
---------
-
-Keith Burns
-
-Slideshow
----------
-
-`Presentation Powerpoint <https://docs.google.com/presentation/d/1O4Cw8WQDnTIqkGFnLB6YLIO184oBkPzgWVaahElI8Qo/pub?start=false&loop=false&delayms=3000>`_
-
-Video
------
-
-`DevBoot Presentation <https://www.youtube.com/watch?v=tAPMjAWR_h0>`_
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-5-dpdkintroduction.rst b/docs/events/fdioTraining/AllTrainingContent/DayOne/1-5-dpdkintroduction.rst
deleted file mode 100644
index eec0da1..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayOne/1-5-dpdkintroduction.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _1-5-dpdkintroduction:
-
-.. toctree::
-
-====================================
-FD.io DevBoot: 1.5 DPDK Introduction
-====================================
-
-Event
------
-
-This presentation was held during the FD.io Training/Hackfest on April 5th, 2016.
-
-Speakers
---------
-
-Cristian Dumitrescu
-
-Slideshow
----------
-
-`Presentation Powerpoint <https://drive.google.com/open?id=0B_RDwdFu5VJDUGI2dmg1dWl0T3M>`_
-
-Video
------
-
-`DevBoot Presentation <https://www.youtube.com/watch?v=ewsrzoKwwz0>`_
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayOne/index.rst b/docs/events/fdioTraining/AllTrainingContent/DayOne/index.rst
deleted file mode 100644
index 62f4905..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayOne/index.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _DayOne:
-
-.. toctree::
-
-#######
-Day One
-#######
-
-List of FD.io presentations that were held in the FD.io Training/Hackfest on April 5th, 2016.
-
-.. toctree::
-    :maxdepth: 1
-    
-    1-2-vppoverview.rst
-    1-3-containerdemo.rst
-    1-4-codecontributionmechanics.rst
-    1-5-dpdkintroduction.rst
\ No newline at end of file
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/2-4-more-macswap.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/2-4-more-macswap.rst
deleted file mode 100644
index c8de60f..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/2-4-more-macswap.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _2-4-more-macswap:
-
-.. toctree::
-
-################
-2 4 more macswap
-################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-1-buffer-metadata.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/3-1-buffer-metadata.rst
deleted file mode 100644
index ac3a1a6..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-1-buffer-metadata.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _3-1-buffer-metadata:
-
-.. toctree::
-
-###################
-3 1 buffer metadata
-###################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-2-multicorewalkthruanddpdkintegration.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/3-2-multicorewalkthruanddpdkintegration.rst
deleted file mode 100644
index 18f1290..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-2-multicorewalkthruanddpdkintegration.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _3-2-multicorewalkthruanddpdkintegration:
-
-.. toctree::
-
-##############
-3 2 multi core
-##############
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-3-dpdkoptimizations.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/3-3-dpdkoptimizations.rst
deleted file mode 100644
index e3725f5..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/3-3-dpdkoptimizations.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _3-3-dpdkoptimizations:
-
-.. toctree::
-
-##################
-DPDK Optimizations
-##################
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/index.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/index.rst
deleted file mode 100644
index 547299c..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/index.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-.. _DayThree:
-
-.. toctree::
-
-#########
-Day Three
-#########
-
-.. toctree::
-    :maxdepth: 1
-    
-    preworkandscripts.rst
-    2-4-more-macswap.rst
-    3-1-buffer-metadata.rst
-    3-2-multicorewalkthruanddpdkintegration.rst
-    3-3-dpdkoptimizations.rst
-    supplemental-graphwiringnotes.rst
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/preworkandscripts.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/preworkandscripts.rst
deleted file mode 100644
index de84fac..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/preworkandscripts.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _preworkandscripts:
-
-.. toctree::
-
-########
-Pre Work
-########
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayThree/supplemental-graphwiringnotes.rst b/docs/events/fdioTraining/AllTrainingContent/DayThree/supplemental-graphwiringnotes.rst
deleted file mode 100644
index a2fae2d..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayThree/supplemental-graphwiringnotes.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _supplemental-graphwiringnotes.rst:
-
-.. toctree::
-
-############
-Supplemental
-############
-
-Event
------
-
-This presentation was held during the on  th, 201.
-
-Speakers
---------
-
-
-Slideshow
----------
-
-Video
------
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-1-dataplane-codeoverview.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-1-dataplane-codeoverview.rst
deleted file mode 100644
index f25fe1f..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-1-dataplane-codeoverview.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _2-1-dataplane-codeoverview:
-
-.. toctree::
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-2-vppinit.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-2-vppinit.rst
deleted file mode 100644
index 35d3fd3..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-2-vppinit.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _2-2-vppinit:
-
-.. toctree::
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-3-eventlogger.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-3-eventlogger.rst
deleted file mode 100644
index a0b9130..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-3-eventlogger.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-.. _2-3-eventlogger:
-
-.. toctree::
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-4-macswapbreakdown.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-4-macswapbreakdown.rst
deleted file mode 100644
index a0f6753..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/2-4-macswapbreakdown.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. _2_4__macswapbreakdown:
-
-==================
-Mac Swap Breakdown
-==================
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/index.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/index.rst
deleted file mode 100644
index 5554667..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. _DayTwo:
-
-=======
-Day Two
-=======
-
-.. toctree::
-    :maxdepth: 1
-
-    preworkandscripts.rst
-    2-1-dataplane-codeoverview.rst
-    2-2-vppinit.rst
-    2-3-eventlogger.rst
-    2-4-macswapbreakdown.rst
-      
diff --git a/docs/events/fdioTraining/AllTrainingContent/DayTwo/preworkandscripts.rst b/docs/events/fdioTraining/AllTrainingContent/DayTwo/preworkandscripts.rst
deleted file mode 100644
index f229214..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/DayTwo/preworkandscripts.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. _preworkandscripts:
-
-.. toctree::
-
-#########################################
-FD.io DevBoot: Day 2 Pre-work and scripts
-#########################################
-
-Event
------
-
-This presentation was held on April, 2016.
-
-Preparing for Day 2
--------------------
-
-#. :ref:`vppcontainers`
-#. Build vagrant environment
-
-.. code-block:: console
-    
-    $ vagrant ssh 
-    $ sudo su
-    $ wget -O /vagrant/netns.sh "https://tinyurl.com/devboot-netns"
-    $ wget -O /vagrant/macswap.conf "https://tinyurl.com/devboot-macswap-conf"
-    $ wget -O ~/.gdbinit "https://tinyurl.com/devboot-gdbinit"
-
-.. note::
-
-    For Init section:
-    Breakpoints
-    High-level chicken-scrawl of init
-
-
diff --git a/docs/events/fdioTraining/AllTrainingContent/index.rst b/docs/events/fdioTraining/AllTrainingContent/index.rst
deleted file mode 100644
index 2fe068a..0000000
--- a/docs/events/fdioTraining/AllTrainingContent/index.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-.. _AllTrainingContent:
-
-.. toctree::
-
-#####################
-All Technical Content
-#####################
-
-As each session is delivered, the content will be provided here initially as PDF, with links to Videos, other content, to come as available.
-These presentations were held during the FD.io Training/Hackfest on April 5th, 2016.
-
-=======
-Day One
-=======
-
-.. toctree::
-
-    DayOne/index.rst
-
-=======
-Day Two
-=======
-
-.. toctree::
-
-    DayTwo/index.rst
-
-=========
-Day Three
-=========
-
-.. toctree::
-
-    DayThree/index.rst
-
-========
-Day Four
-========
-
-.. toctree::
-
-    DayFour/index.rst
-
-
-
diff --git a/docs/events/fdioTraining/index.rst b/docs/events/fdioTraining/index.rst
deleted file mode 100644
index 8acc681..0000000
--- a/docs/events/fdioTraining/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _fdioTraining:
-
-.. toctree::
-
-###########################
-April 2016 - FD.io Training
-###########################
-
-.. toctree::
-    :maxdepth: 2
-
-    2016_04_05_faster.rst
-    AllTrainingContent/index.rst
\ No newline at end of file
diff --git a/docs/events/index.rst b/docs/events/index.rst
index f10c368..06d14ef 100644
--- a/docs/events/index.rst
+++ b/docs/events/index.rst
@@ -13,9 +13,9 @@
 .. toctree::
     :maxdepth: 2
     
-    Linuxcon/index.rst
-    CiscoLiveUS/index.rst
-    OSCON/index.rst
+    Conferences/Linuxcon/index.rst
+    Conferences/CiscoLiveUS/index.rst
+    Conferences/OSCON/index.rst
 
     
 =======
@@ -25,17 +25,17 @@
 .. toctree::
     :maxdepth: 2
 
-    FDioMiniSummit/KubeCon/index.rst
-    DPDKSummit/2017/index.rst
-    OpensourceSummit/index.rst
-    FDioMiniSummit/index.rst
-    UKNO/index.rst
-    OpNFV/index.rst
-    DPDKSummit/index.rst  
-    OpNFV/OpNFVtechnicalwork/index.rst
-    OpenNetworkSummit/index.rst
-    OpNFV/OPNFVSummit/index.rst
-    OpenDaylight/index.rst
+    Summits/FDioMiniSummit/KubeCon_2017/index.rst
+    Summits/DPDKSummit/index.rst
+    Summits/OpensourceSummit/index.rst
+    Summits/FDioMiniSummit/index.rst
+    Summits/UKNO/index.rst
+    Summits/OpNFV/index.rst
+    Summits/DPDKSummit/2016/index.rst
+    Summits/OpNFV/OpNFVtechnicalwork/index.rst
+    Summits/OpenNetworkSummit/index.rst
+    Summits/OpNFV/OPNFVSummit/index.rst
+    Summits/OpenDaylight/index.rst
 
 ========
 Meetings
@@ -44,30 +44,17 @@
 .. toctree::
     :maxdepth: 2
 
-    FDIOVPPTerabit/index.rst
-    IntelSDN/index.rst
-    TWSMeeting/index.rst
-    fdioWebinar/index.rst
-    TSCmeeting/index.rst
+    MeetUps/FDIOVPPTerabit/index.rst
+    MeetUps/IntelSDN/index.rst
+    MeetUps/TWS/index.rst
+    MeetUps/fdioWebinar/index.rst
 
-=====
-Calls
-=====
+=========
+Community
+=========
 
 .. toctree::
     :maxdepth: 2
 
-    TLDKCall/index.rst
-    VPPCall/index.rst
-
-====================
-Fd.io Training Event  
-====================
-
-The FD.io Training provides new users with a detailed set of training courses on FD.io
-separated by days.
-
-.. toctree::
-    :maxdepth: 3
-
-    fdioTraining/index.rst
+    Community/VPP/index.rst
+    Community/TSC/index.rst