diff --git a/README b/README
index 8f31a861522897520af2c46c57a82d0e211d8d50..240ffc9a5eb6a432eab6f21f2e6093d72db28b50 100644
--- a/README
+++ b/README
@@ -65,11 +65,15 @@ elgg/mod/reportedcontent https://code.elgg.org/extensions/plugins/reportedconten
 elgg/mod/riverdashboard https://code.elgg.org/extensions/plugins/riverdashboard
 elgg/mod/thewire https://code.elgg.org/extensions/plugins/thewire
 
-elgg/mod/everybody http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/everybody
 elgg/mod/flexprofile http://its-gforge.unl.edu/svn/unl_elgg/trunk/flexprofile_mj
-elgg/mod/form http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/form
-elgg/mod/globe http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/globe
-elgg/mod/cas_auth http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/cas_auth
+elgg/mod/form        http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/form
+elgg/mod/globe 	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/globe
+elgg/mod/messages	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/messages
+elgg/mod/browse	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/browse
+elgg/mod/mass_mailouts	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/mass_mailouts
+elgg/mod/cas_auth	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/cas_auth
+elgg/mod/customindex	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/customindex
+elgg/mod/unl_theme	http://its-gforge.unl.edu/svn/unl_elgg/trunk/plugins/unl_theme 
 
 elgg/featured/ http://its-gforge.unl.edu/svn/unl_huskers/trunk/
 
diff --git a/full_dump.sql b/data/full_dump.sql
similarity index 100%
rename from full_dump.sql
rename to data/full_dump.sql
diff --git a/safe_dump.sql b/data/safe_dump.sql
similarity index 100%
rename from safe_dump.sql
rename to data/safe_dump.sql
diff --git a/safer_dump.sql b/data/safer_dump.sql
similarity index 100%
rename from safer_dump.sql
rename to data/safer_dump.sql
diff --git a/customindex/Atorod_AzizinaminiThumb.jpg b/plugins/customindex/Atorod_AzizinaminiThumb.jpg
similarity index 100%
rename from customindex/Atorod_AzizinaminiThumb.jpg
rename to plugins/customindex/Atorod_AzizinaminiThumb.jpg
diff --git a/customindex/Warren_BuffettThumb.jpg b/plugins/customindex/Warren_BuffettThumb.jpg
similarity index 100%
rename from customindex/Warren_BuffettThumb.jpg
rename to plugins/customindex/Warren_BuffettThumb.jpg
diff --git a/customindex/commentbubblepoint.png b/plugins/customindex/commentbubblepoint.png
similarity index 100%
rename from customindex/commentbubblepoint.png
rename to plugins/customindex/commentbubblepoint.png
diff --git a/customindex/hori_large.png b/plugins/customindex/hori_large.png
similarity index 100%
rename from customindex/hori_large.png
rename to plugins/customindex/hori_large.png
diff --git a/customindex/icon_earth.png b/plugins/customindex/icon_earth.png
similarity index 100%
rename from customindex/icon_earth.png
rename to plugins/customindex/icon_earth.png
diff --git a/customindex/index.php b/plugins/customindex/index.php
similarity index 100%
rename from customindex/index.php
rename to plugins/customindex/index.php
diff --git a/customindex/manifest.xml b/plugins/customindex/manifest.xml
similarity index 100%
rename from customindex/manifest.xml
rename to plugins/customindex/manifest.xml
diff --git a/customindex/map-pin-12.png b/plugins/customindex/map-pin-12.png
similarity index 100%
rename from customindex/map-pin-12.png
rename to plugins/customindex/map-pin-12.png
diff --git a/customindex/putyourself_background.jpg b/plugins/customindex/putyourself_background.jpg
similarity index 100%
rename from customindex/putyourself_background.jpg
rename to plugins/customindex/putyourself_background.jpg
diff --git a/customindex/putyourself_background.psd b/plugins/customindex/putyourself_background.psd
similarity index 100%
rename from customindex/putyourself_background.psd
rename to plugins/customindex/putyourself_background.psd
diff --git a/customindex/splash_selector.png b/plugins/customindex/splash_selector.png
similarity index 100%
rename from customindex/splash_selector.png
rename to plugins/customindex/splash_selector.png
diff --git a/customindex/start.php b/plugins/customindex/start.php
similarity index 100%
rename from customindex/start.php
rename to plugins/customindex/start.php
diff --git a/customindex/views/default/customindex/content.php b/plugins/customindex/views/default/customindex/content.php
similarity index 100%
rename from customindex/views/default/customindex/content.php
rename to plugins/customindex/views/default/customindex/content.php
diff --git a/customindex/views/default/customindex/css.php b/plugins/customindex/views/default/customindex/css.php
similarity index 100%
rename from customindex/views/default/customindex/css.php
rename to plugins/customindex/views/default/customindex/css.php
diff --git a/customindex/views/default/customindex/globesplash.js b/plugins/customindex/views/default/customindex/globesplash.js
similarity index 100%
rename from customindex/views/default/customindex/globesplash.js
rename to plugins/customindex/views/default/customindex/globesplash.js
diff --git a/customindex/views/default/customindex/images/video_thumbs/video.png b/plugins/customindex/views/default/customindex/images/video_thumbs/video.png
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/video.png
rename to plugins/customindex/views/default/customindex/images/video_thumbs/video.png
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoStill.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoStill.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoStill.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoStill.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumb.png b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumb.png
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumb.png
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumb.png
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbAtorodAzizinamini.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbAtorodAzizinamini.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbAtorodAzizinamini.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbAtorodAzizinamini.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbBetsy.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbBetsy.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbBetsy.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbBetsy.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbChinaArchitects.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbChinaArchitects.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbChinaArchitects.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbChinaArchitects.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbClaudeBolton.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbClaudeBolton.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbClaudeBolton.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbClaudeBolton.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbErica.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbErica.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbErica.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbErica.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbHudgins.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbHudgins.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbHudgins.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbHudgins.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbJayKeasling.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJayKeasling.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbJayKeasling.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJayKeasling.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbJeffZeleny.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJeffZeleny.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbJeffZeleny.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJeffZeleny.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbJohn.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJohn.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbJohn.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbJohn.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbKenVogel.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbKenVogel.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbKenVogel.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbKenVogel.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbLloydAmbrosius.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbLloydAmbrosius.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbLloydAmbrosius.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbLloydAmbrosius.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbMicrogravity.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbMicrogravity.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbMicrogravity.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbMicrogravity.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbNithal.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbNithal.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbNithal.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbNithal.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbPromo.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbPromo.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbPromo.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbPromo.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbRulan.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbRulan.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbRulan.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbRulan.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbScottKillinger.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbScottKillinger.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbScottKillinger.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbScottKillinger.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbShane.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbShane.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbShane.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbShane.jpg
diff --git a/customindex/views/default/customindex/images/video_thumbs/videoThumbZNet.jpg b/plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbZNet.jpg
similarity index 100%
rename from customindex/views/default/customindex/images/video_thumbs/videoThumbZNet.jpg
rename to plugins/customindex/views/default/customindex/images/video_thumbs/videoThumbZNet.jpg
diff --git a/customindex/views/default/customindex/metatags.php b/plugins/customindex/views/default/customindex/metatags.php
similarity index 100%
rename from customindex/views/default/customindex/metatags.php
rename to plugins/customindex/views/default/customindex/metatags.php
diff --git a/customindex/witw_icons/Ann_Chang-Barnes.jpg b/plugins/customindex/witw_icons/Ann_Chang-Barnes.jpg
similarity index 100%
rename from customindex/witw_icons/Ann_Chang-Barnes.jpg
rename to plugins/customindex/witw_icons/Ann_Chang-Barnes.jpg
diff --git a/customindex/witw_icons/Ann_Chang-Barnes_medium.jpg b/plugins/customindex/witw_icons/Ann_Chang-Barnes_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Ann_Chang-Barnes_medium.jpg
rename to plugins/customindex/witw_icons/Ann_Chang-Barnes_medium.jpg
diff --git a/customindex/witw_icons/Ann_Chang-Barnes_tiny.jpg b/plugins/customindex/witw_icons/Ann_Chang-Barnes_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Ann_Chang-Barnes_tiny.jpg
rename to plugins/customindex/witw_icons/Ann_Chang-Barnes_tiny.jpg
diff --git a/customindex/witw_icons/Atorod_Azizinamini.jpg b/plugins/customindex/witw_icons/Atorod_Azizinamini.jpg
similarity index 100%
rename from customindex/witw_icons/Atorod_Azizinamini.jpg
rename to plugins/customindex/witw_icons/Atorod_Azizinamini.jpg
diff --git a/customindex/witw_icons/Atorod_Azizinamini_medium.jpg b/plugins/customindex/witw_icons/Atorod_Azizinamini_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Atorod_Azizinamini_medium.jpg
rename to plugins/customindex/witw_icons/Atorod_Azizinamini_medium.jpg
diff --git a/customindex/witw_icons/Atorod_Azizinamini_tiny.jpg b/plugins/customindex/witw_icons/Atorod_Azizinamini_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Atorod_Azizinamini_tiny.jpg
rename to plugins/customindex/witw_icons/Atorod_Azizinamini_tiny.jpg
diff --git a/customindex/witw_icons/Avery_Schwer.jpg b/plugins/customindex/witw_icons/Avery_Schwer.jpg
similarity index 100%
rename from customindex/witw_icons/Avery_Schwer.jpg
rename to plugins/customindex/witw_icons/Avery_Schwer.jpg
diff --git a/customindex/witw_icons/Avery_Schwer_medium.jpg b/plugins/customindex/witw_icons/Avery_Schwer_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Avery_Schwer_medium.jpg
rename to plugins/customindex/witw_icons/Avery_Schwer_medium.jpg
diff --git a/customindex/witw_icons/Avery_Schwer_tiny.jpg b/plugins/customindex/witw_icons/Avery_Schwer_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Avery_Schwer_tiny.jpg
rename to plugins/customindex/witw_icons/Avery_Schwer_tiny.jpg
diff --git a/customindex/witw_icons/Betsy_O'Brien.jpg b/plugins/customindex/witw_icons/Betsy_O'Brien.jpg
similarity index 100%
rename from customindex/witw_icons/Betsy_O'Brien.jpg
rename to plugins/customindex/witw_icons/Betsy_O'Brien.jpg
diff --git a/customindex/witw_icons/Betsy_O'Brien_medium.jpg b/plugins/customindex/witw_icons/Betsy_O'Brien_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Betsy_O'Brien_medium.jpg
rename to plugins/customindex/witw_icons/Betsy_O'Brien_medium.jpg
diff --git a/customindex/witw_icons/Betsy_O'Brien_tiny.jpg b/plugins/customindex/witw_icons/Betsy_O'Brien_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Betsy_O'Brien_tiny.jpg
rename to plugins/customindex/witw_icons/Betsy_O'Brien_tiny.jpg
diff --git a/customindex/witw_icons/Bing_Chen.jpg b/plugins/customindex/witw_icons/Bing_Chen.jpg
similarity index 100%
rename from customindex/witw_icons/Bing_Chen.jpg
rename to plugins/customindex/witw_icons/Bing_Chen.jpg
diff --git a/customindex/witw_icons/Bing_Chen_medium.jpg b/plugins/customindex/witw_icons/Bing_Chen_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Bing_Chen_medium.jpg
rename to plugins/customindex/witw_icons/Bing_Chen_medium.jpg
diff --git a/customindex/witw_icons/Bing_Chen_tiny.jpg b/plugins/customindex/witw_icons/Bing_Chen_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Bing_Chen_tiny.jpg
rename to plugins/customindex/witw_icons/Bing_Chen_tiny.jpg
diff --git a/customindex/witw_icons/Bob_Thacker.jpg b/plugins/customindex/witw_icons/Bob_Thacker.jpg
similarity index 100%
rename from customindex/witw_icons/Bob_Thacker.jpg
rename to plugins/customindex/witw_icons/Bob_Thacker.jpg
diff --git a/customindex/witw_icons/Bob_Thacker_medium.jpg b/plugins/customindex/witw_icons/Bob_Thacker_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Bob_Thacker_medium.jpg
rename to plugins/customindex/witw_icons/Bob_Thacker_medium.jpg
diff --git a/customindex/witw_icons/Bob_Thacker_tiny.jpg b/plugins/customindex/witw_icons/Bob_Thacker_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Bob_Thacker_tiny.jpg
rename to plugins/customindex/witw_icons/Bob_Thacker_tiny.jpg
diff --git a/customindex/witw_icons/Brett_Ratcliffe.jpg b/plugins/customindex/witw_icons/Brett_Ratcliffe.jpg
similarity index 100%
rename from customindex/witw_icons/Brett_Ratcliffe.jpg
rename to plugins/customindex/witw_icons/Brett_Ratcliffe.jpg
diff --git a/customindex/witw_icons/Brett_Ratcliffe_medium.jpg b/plugins/customindex/witw_icons/Brett_Ratcliffe_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Brett_Ratcliffe_medium.jpg
rename to plugins/customindex/witw_icons/Brett_Ratcliffe_medium.jpg
diff --git a/customindex/witw_icons/Brett_Ratcliffe_tiny.jpg b/plugins/customindex/witw_icons/Brett_Ratcliffe_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Brett_Ratcliffe_tiny.jpg
rename to plugins/customindex/witw_icons/Brett_Ratcliffe_tiny.jpg
diff --git a/customindex/witw_icons/Charles_Wood.jpg b/plugins/customindex/witw_icons/Charles_Wood.jpg
similarity index 100%
rename from customindex/witw_icons/Charles_Wood.jpg
rename to plugins/customindex/witw_icons/Charles_Wood.jpg
diff --git a/customindex/witw_icons/Charles_Wood_medium.jpg b/plugins/customindex/witw_icons/Charles_Wood_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Charles_Wood_medium.jpg
rename to plugins/customindex/witw_icons/Charles_Wood_medium.jpg
diff --git a/customindex/witw_icons/Charles_Wood_tiny.jpg b/plugins/customindex/witw_icons/Charles_Wood_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Charles_Wood_tiny.jpg
rename to plugins/customindex/witw_icons/Charles_Wood_tiny.jpg
diff --git a/customindex/witw_icons/Christopher_Elbow.jpg b/plugins/customindex/witw_icons/Christopher_Elbow.jpg
similarity index 100%
rename from customindex/witw_icons/Christopher_Elbow.jpg
rename to plugins/customindex/witw_icons/Christopher_Elbow.jpg
diff --git a/customindex/witw_icons/Christopher_Elbow_medium.jpg b/plugins/customindex/witw_icons/Christopher_Elbow_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Christopher_Elbow_medium.jpg
rename to plugins/customindex/witw_icons/Christopher_Elbow_medium.jpg
diff --git a/customindex/witw_icons/Christopher_Elbow_tiny.jpg b/plugins/customindex/witw_icons/Christopher_Elbow_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Christopher_Elbow_tiny.jpg
rename to plugins/customindex/witw_icons/Christopher_Elbow_tiny.jpg
diff --git a/customindex/witw_icons/Cindy_McCaffrey.jpg b/plugins/customindex/witw_icons/Cindy_McCaffrey.jpg
similarity index 100%
rename from customindex/witw_icons/Cindy_McCaffrey.jpg
rename to plugins/customindex/witw_icons/Cindy_McCaffrey.jpg
diff --git a/customindex/witw_icons/Cindy_McCaffrey_medium.jpg b/plugins/customindex/witw_icons/Cindy_McCaffrey_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Cindy_McCaffrey_medium.jpg
rename to plugins/customindex/witw_icons/Cindy_McCaffrey_medium.jpg
diff --git a/customindex/witw_icons/Cindy_McCaffrey_tiny.jpg b/plugins/customindex/witw_icons/Cindy_McCaffrey_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Cindy_McCaffrey_tiny.jpg
rename to plugins/customindex/witw_icons/Cindy_McCaffrey_tiny.jpg
diff --git a/customindex/witw_icons/Claude-M_Bolton-Jr.jpg b/plugins/customindex/witw_icons/Claude-M_Bolton-Jr.jpg
similarity index 100%
rename from customindex/witw_icons/Claude-M_Bolton-Jr.jpg
rename to plugins/customindex/witw_icons/Claude-M_Bolton-Jr.jpg
diff --git a/customindex/witw_icons/Claude-M_Bolton-Jr_medium.jpg b/plugins/customindex/witw_icons/Claude-M_Bolton-Jr_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Claude-M_Bolton-Jr_medium.jpg
rename to plugins/customindex/witw_icons/Claude-M_Bolton-Jr_medium.jpg
diff --git a/customindex/witw_icons/Claude-M_Bolton-Jr_tiny.jpg b/plugins/customindex/witw_icons/Claude-M_Bolton-Jr_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Claude-M_Bolton-Jr_tiny.jpg
rename to plugins/customindex/witw_icons/Claude-M_Bolton-Jr_tiny.jpg
diff --git a/customindex/witw_icons/David_Harwood.jpg b/plugins/customindex/witw_icons/David_Harwood.jpg
similarity index 100%
rename from customindex/witw_icons/David_Harwood.jpg
rename to plugins/customindex/witw_icons/David_Harwood.jpg
diff --git a/customindex/witw_icons/David_Harwood_medium.jpg b/plugins/customindex/witw_icons/David_Harwood_medium.jpg
similarity index 100%
rename from customindex/witw_icons/David_Harwood_medium.jpg
rename to plugins/customindex/witw_icons/David_Harwood_medium.jpg
diff --git a/customindex/witw_icons/David_Harwood_tiny.jpg b/plugins/customindex/witw_icons/David_Harwood_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/David_Harwood_tiny.jpg
rename to plugins/customindex/witw_icons/David_Harwood_tiny.jpg
diff --git a/customindex/witw_icons/Dr-L-Trey_Coleman.jpg b/plugins/customindex/witw_icons/Dr-L-Trey_Coleman.jpg
similarity index 100%
rename from customindex/witw_icons/Dr-L-Trey_Coleman.jpg
rename to plugins/customindex/witw_icons/Dr-L-Trey_Coleman.jpg
diff --git a/customindex/witw_icons/Dr-L-Trey_Coleman_medium.jpg b/plugins/customindex/witw_icons/Dr-L-Trey_Coleman_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Dr-L-Trey_Coleman_medium.jpg
rename to plugins/customindex/witw_icons/Dr-L-Trey_Coleman_medium.jpg
diff --git a/customindex/witw_icons/Dr-L-Trey_Coleman_tiny.jpg b/plugins/customindex/witw_icons/Dr-L-Trey_Coleman_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Dr-L-Trey_Coleman_tiny.jpg
rename to plugins/customindex/witw_icons/Dr-L-Trey_Coleman_tiny.jpg
diff --git a/customindex/witw_icons/Granville_Coggs.jpg b/plugins/customindex/witw_icons/Granville_Coggs.jpg
similarity index 100%
rename from customindex/witw_icons/Granville_Coggs.jpg
rename to plugins/customindex/witw_icons/Granville_Coggs.jpg
diff --git a/customindex/witw_icons/Granville_Coggs_medium.jpg b/plugins/customindex/witw_icons/Granville_Coggs_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Granville_Coggs_medium.jpg
rename to plugins/customindex/witw_icons/Granville_Coggs_medium.jpg
diff --git a/customindex/witw_icons/Granville_Coggs_tiny.jpg b/plugins/customindex/witw_icons/Granville_Coggs_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Granville_Coggs_tiny.jpg
rename to plugins/customindex/witw_icons/Granville_Coggs_tiny.jpg
diff --git a/customindex/witw_icons/Jay_Keasling.jpg b/plugins/customindex/witw_icons/Jay_Keasling.jpg
similarity index 100%
rename from customindex/witw_icons/Jay_Keasling.jpg
rename to plugins/customindex/witw_icons/Jay_Keasling.jpg
diff --git a/customindex/witw_icons/Jay_Keasling_medium.jpg b/plugins/customindex/witw_icons/Jay_Keasling_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Jay_Keasling_medium.jpg
rename to plugins/customindex/witw_icons/Jay_Keasling_medium.jpg
diff --git a/customindex/witw_icons/Jay_Keasling_tiny.jpg b/plugins/customindex/witw_icons/Jay_Keasling_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Jay_Keasling_tiny.jpg
rename to plugins/customindex/witw_icons/Jay_Keasling_tiny.jpg
diff --git a/customindex/witw_icons/Jeffrey_Raikes.jpg b/plugins/customindex/witw_icons/Jeffrey_Raikes.jpg
similarity index 100%
rename from customindex/witw_icons/Jeffrey_Raikes.jpg
rename to plugins/customindex/witw_icons/Jeffrey_Raikes.jpg
diff --git a/customindex/witw_icons/Jeffrey_Raikes_medium.jpg b/plugins/customindex/witw_icons/Jeffrey_Raikes_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Jeffrey_Raikes_medium.jpg
rename to plugins/customindex/witw_icons/Jeffrey_Raikes_medium.jpg
diff --git a/customindex/witw_icons/Jeffrey_Raikes_tiny.jpg b/plugins/customindex/witw_icons/Jeffrey_Raikes_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Jeffrey_Raikes_tiny.jpg
rename to plugins/customindex/witw_icons/Jeffrey_Raikes_tiny.jpg
diff --git a/customindex/witw_icons/Jerry_Hudgins_medium.jpg b/plugins/customindex/witw_icons/Jerry_Hudgins_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Jerry_Hudgins_medium.jpg
rename to plugins/customindex/witw_icons/Jerry_Hudgins_medium.jpg
diff --git a/customindex/witw_icons/Jerry_Hudgins_tiny.jpg b/plugins/customindex/witw_icons/Jerry_Hudgins_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Jerry_Hudgins_tiny.jpg
rename to plugins/customindex/witw_icons/Jerry_Hudgins_tiny.jpg
diff --git a/customindex/witw_icons/John_Hibbing.jpg b/plugins/customindex/witw_icons/John_Hibbing.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hibbing.jpg
rename to plugins/customindex/witw_icons/John_Hibbing.jpg
diff --git a/customindex/witw_icons/John_Hibbing_medium.jpg b/plugins/customindex/witw_icons/John_Hibbing_medium.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hibbing_medium.jpg
rename to plugins/customindex/witw_icons/John_Hibbing_medium.jpg
diff --git a/customindex/witw_icons/John_Hibbing_tiny.jpg b/plugins/customindex/witw_icons/John_Hibbing_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hibbing_tiny.jpg
rename to plugins/customindex/witw_icons/John_Hibbing_tiny.jpg
diff --git a/customindex/witw_icons/John_Hoerner.jpg b/plugins/customindex/witw_icons/John_Hoerner.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hoerner.jpg
rename to plugins/customindex/witw_icons/John_Hoerner.jpg
diff --git a/customindex/witw_icons/John_Hoerner_medium.jpg b/plugins/customindex/witw_icons/John_Hoerner_medium.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hoerner_medium.jpg
rename to plugins/customindex/witw_icons/John_Hoerner_medium.jpg
diff --git a/customindex/witw_icons/John_Hoerner_tiny.jpg b/plugins/customindex/witw_icons/John_Hoerner_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/John_Hoerner_tiny.jpg
rename to plugins/customindex/witw_icons/John_Hoerner_tiny.jpg
diff --git a/customindex/witw_icons/John_Janovy-Jr.jpg b/plugins/customindex/witw_icons/John_Janovy-Jr.jpg
similarity index 100%
rename from customindex/witw_icons/John_Janovy-Jr.jpg
rename to plugins/customindex/witw_icons/John_Janovy-Jr.jpg
diff --git a/customindex/witw_icons/John_Janovy-Jr_medium.jpg b/plugins/customindex/witw_icons/John_Janovy-Jr_medium.jpg
similarity index 100%
rename from customindex/witw_icons/John_Janovy-Jr_medium.jpg
rename to plugins/customindex/witw_icons/John_Janovy-Jr_medium.jpg
diff --git a/customindex/witw_icons/John_Janovy-Jr_tiny.jpg b/plugins/customindex/witw_icons/John_Janovy-Jr_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/John_Janovy-Jr_tiny.jpg
rename to plugins/customindex/witw_icons/John_Janovy-Jr_tiny.jpg
diff --git a/customindex/witw_icons/John_Yohe.jpg b/plugins/customindex/witw_icons/John_Yohe.jpg
similarity index 100%
rename from customindex/witw_icons/John_Yohe.jpg
rename to plugins/customindex/witw_icons/John_Yohe.jpg
diff --git a/customindex/witw_icons/John_Yohe_medium.jpg b/plugins/customindex/witw_icons/John_Yohe_medium.jpg
similarity index 100%
rename from customindex/witw_icons/John_Yohe_medium.jpg
rename to plugins/customindex/witw_icons/John_Yohe_medium.jpg
diff --git a/customindex/witw_icons/John_Yohe_tiny.jpg b/plugins/customindex/witw_icons/John_Yohe_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/John_Yohe_tiny.jpg
rename to plugins/customindex/witw_icons/John_Yohe_tiny.jpg
diff --git a/customindex/witw_icons/Jorge-Alberto_Rodriguez.jpg b/plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez.jpg
similarity index 100%
rename from customindex/witw_icons/Jorge-Alberto_Rodriguez.jpg
rename to plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez.jpg
diff --git a/customindex/witw_icons/Jorge-Alberto_Rodriguez_medium.jpg b/plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Jorge-Alberto_Rodriguez_medium.jpg
rename to plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez_medium.jpg
diff --git a/customindex/witw_icons/Jorge-Alberto_Rodriguez_tiny.jpg b/plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Jorge-Alberto_Rodriguez_tiny.jpg
rename to plugins/customindex/witw_icons/Jorge-Alberto_Rodriguez_tiny.jpg
diff --git a/customindex/witw_icons/Juanita_Page.jpg b/plugins/customindex/witw_icons/Juanita_Page.jpg
similarity index 100%
rename from customindex/witw_icons/Juanita_Page.jpg
rename to plugins/customindex/witw_icons/Juanita_Page.jpg
diff --git a/customindex/witw_icons/Juanita_Page_medium.jpg b/plugins/customindex/witw_icons/Juanita_Page_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Juanita_Page_medium.jpg
rename to plugins/customindex/witw_icons/Juanita_Page_medium.jpg
diff --git a/customindex/witw_icons/Juanita_Page_tiny.jpg b/plugins/customindex/witw_icons/Juanita_Page_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Juanita_Page_tiny.jpg
rename to plugins/customindex/witw_icons/Juanita_Page_tiny.jpg
diff --git a/customindex/witw_icons/Karen_Kunc.jpg b/plugins/customindex/witw_icons/Karen_Kunc.jpg
similarity index 100%
rename from customindex/witw_icons/Karen_Kunc.jpg
rename to plugins/customindex/witw_icons/Karen_Kunc.jpg
diff --git a/customindex/witw_icons/Karen_Kunc_medium.jpg b/plugins/customindex/witw_icons/Karen_Kunc_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Karen_Kunc_medium.jpg
rename to plugins/customindex/witw_icons/Karen_Kunc_medium.jpg
diff --git a/customindex/witw_icons/Karen_Kunc_tiny.jpg b/plugins/customindex/witw_icons/Karen_Kunc_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Karen_Kunc_tiny.jpg
rename to plugins/customindex/witw_icons/Karen_Kunc_tiny.jpg
diff --git a/customindex/witw_icons/Ken_Vogel.jpg b/plugins/customindex/witw_icons/Ken_Vogel.jpg
similarity index 100%
rename from customindex/witw_icons/Ken_Vogel.jpg
rename to plugins/customindex/witw_icons/Ken_Vogel.jpg
diff --git a/customindex/witw_icons/Ken_Vogel_medium.jpg b/plugins/customindex/witw_icons/Ken_Vogel_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Ken_Vogel_medium.jpg
rename to plugins/customindex/witw_icons/Ken_Vogel_medium.jpg
diff --git a/customindex/witw_icons/Ken_Vogel_tiny.jpg b/plugins/customindex/witw_icons/Ken_Vogel_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Ken_Vogel_tiny.jpg
rename to plugins/customindex/witw_icons/Ken_Vogel_tiny.jpg
diff --git a/customindex/witw_icons/Larkin_Powell.jpg b/plugins/customindex/witw_icons/Larkin_Powell.jpg
similarity index 100%
rename from customindex/witw_icons/Larkin_Powell.jpg
rename to plugins/customindex/witw_icons/Larkin_Powell.jpg
diff --git a/customindex/witw_icons/Larkin_Powell_medium.jpg b/plugins/customindex/witw_icons/Larkin_Powell_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Larkin_Powell_medium.jpg
rename to plugins/customindex/witw_icons/Larkin_Powell_medium.jpg
diff --git a/customindex/witw_icons/Larkin_Powell_tiny.jpg b/plugins/customindex/witw_icons/Larkin_Powell_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Larkin_Powell_tiny.jpg
rename to plugins/customindex/witw_icons/Larkin_Powell_tiny.jpg
diff --git a/customindex/witw_icons/Michael_Hoff.jpg b/plugins/customindex/witw_icons/Michael_Hoff.jpg
similarity index 100%
rename from customindex/witw_icons/Michael_Hoff.jpg
rename to plugins/customindex/witw_icons/Michael_Hoff.jpg
diff --git a/customindex/witw_icons/Michael_Hoff_medium.jpg b/plugins/customindex/witw_icons/Michael_Hoff_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Michael_Hoff_medium.jpg
rename to plugins/customindex/witw_icons/Michael_Hoff_medium.jpg
diff --git a/customindex/witw_icons/Michael_Hoff_tiny.jpg b/plugins/customindex/witw_icons/Michael_Hoff_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Michael_Hoff_tiny.jpg
rename to plugins/customindex/witw_icons/Michael_Hoff_tiny.jpg
diff --git a/customindex/witw_icons/Microgravity_Students.jpg b/plugins/customindex/witw_icons/Microgravity_Students.jpg
similarity index 100%
rename from customindex/witw_icons/Microgravity_Students.jpg
rename to plugins/customindex/witw_icons/Microgravity_Students.jpg
diff --git a/customindex/witw_icons/Microgravity_Students_medium.jpg b/plugins/customindex/witw_icons/Microgravity_Students_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Microgravity_Students_medium.jpg
rename to plugins/customindex/witw_icons/Microgravity_Students_medium.jpg
diff --git a/customindex/witw_icons/Microgravity_Students_tiny.jpg b/plugins/customindex/witw_icons/Microgravity_Students_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Microgravity_Students_tiny.jpg
rename to plugins/customindex/witw_icons/Microgravity_Students_tiny.jpg
diff --git a/customindex/witw_icons/Nancy_Andreasen.jpg b/plugins/customindex/witw_icons/Nancy_Andreasen.jpg
similarity index 100%
rename from customindex/witw_icons/Nancy_Andreasen.jpg
rename to plugins/customindex/witw_icons/Nancy_Andreasen.jpg
diff --git a/customindex/witw_icons/Nancy_Andreasen_medium.jpg b/plugins/customindex/witw_icons/Nancy_Andreasen_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Nancy_Andreasen_medium.jpg
rename to plugins/customindex/witw_icons/Nancy_Andreasen_medium.jpg
diff --git a/customindex/witw_icons/Nancy_Andreasen_tiny.jpg b/plugins/customindex/witw_icons/Nancy_Andreasen_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Nancy_Andreasen_tiny.jpg
rename to plugins/customindex/witw_icons/Nancy_Andreasen_tiny.jpg
diff --git a/customindex/witw_icons/Nithal_Kuwa.jpg b/plugins/customindex/witw_icons/Nithal_Kuwa.jpg
similarity index 100%
rename from customindex/witw_icons/Nithal_Kuwa.jpg
rename to plugins/customindex/witw_icons/Nithal_Kuwa.jpg
diff --git a/customindex/witw_icons/Nithal_Kuwa_medium.jpg b/plugins/customindex/witw_icons/Nithal_Kuwa_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Nithal_Kuwa_medium.jpg
rename to plugins/customindex/witw_icons/Nithal_Kuwa_medium.jpg
diff --git a/customindex/witw_icons/Nithal_Kuwa_tiny.jpg b/plugins/customindex/witw_icons/Nithal_Kuwa_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Nithal_Kuwa_tiny.jpg
rename to plugins/customindex/witw_icons/Nithal_Kuwa_tiny.jpg
diff --git a/customindex/witw_icons/Pam_Dingman.jpg b/plugins/customindex/witw_icons/Pam_Dingman.jpg
similarity index 100%
rename from customindex/witw_icons/Pam_Dingman.jpg
rename to plugins/customindex/witw_icons/Pam_Dingman.jpg
diff --git a/customindex/witw_icons/Pam_Dingman_medium.jpg b/plugins/customindex/witw_icons/Pam_Dingman_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Pam_Dingman_medium.jpg
rename to plugins/customindex/witw_icons/Pam_Dingman_medium.jpg
diff --git a/customindex/witw_icons/Pam_Dingman_tiny.jpg b/plugins/customindex/witw_icons/Pam_Dingman_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Pam_Dingman_tiny.jpg
rename to plugins/customindex/witw_icons/Pam_Dingman_tiny.jpg
diff --git a/customindex/witw_icons/Rulon_Gardner.jpg b/plugins/customindex/witw_icons/Rulon_Gardner.jpg
similarity index 100%
rename from customindex/witw_icons/Rulon_Gardner.jpg
rename to plugins/customindex/witw_icons/Rulon_Gardner.jpg
diff --git a/customindex/witw_icons/Rulon_Gardner_medium.jpg b/plugins/customindex/witw_icons/Rulon_Gardner_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Rulon_Gardner_medium.jpg
rename to plugins/customindex/witw_icons/Rulon_Gardner_medium.jpg
diff --git a/customindex/witw_icons/Rulon_Gardner_tiny.jpg b/plugins/customindex/witw_icons/Rulon_Gardner_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Rulon_Gardner_tiny.jpg
rename to plugins/customindex/witw_icons/Rulon_Gardner_tiny.jpg
diff --git a/customindex/witw_icons/Scott_Killinger.jpg b/plugins/customindex/witw_icons/Scott_Killinger.jpg
similarity index 100%
rename from customindex/witw_icons/Scott_Killinger.jpg
rename to plugins/customindex/witw_icons/Scott_Killinger.jpg
diff --git a/customindex/witw_icons/Scott_Killinger_medium.jpg b/plugins/customindex/witw_icons/Scott_Killinger_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Scott_Killinger_medium.jpg
rename to plugins/customindex/witw_icons/Scott_Killinger_medium.jpg
diff --git a/customindex/witw_icons/Scott_Killinger_tiny.jpg b/plugins/customindex/witw_icons/Scott_Killinger_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Scott_Killinger_tiny.jpg
rename to plugins/customindex/witw_icons/Scott_Killinger_tiny.jpg
diff --git a/customindex/witw_icons/Shane_Farritor.jpg b/plugins/customindex/witw_icons/Shane_Farritor.jpg
similarity index 100%
rename from customindex/witw_icons/Shane_Farritor.jpg
rename to plugins/customindex/witw_icons/Shane_Farritor.jpg
diff --git a/customindex/witw_icons/Shane_Farritor_medium.jpg b/plugins/customindex/witw_icons/Shane_Farritor_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Shane_Farritor_medium.jpg
rename to plugins/customindex/witw_icons/Shane_Farritor_medium.jpg
diff --git a/customindex/witw_icons/Shane_Farritor_tiny.jpg b/plugins/customindex/witw_icons/Shane_Farritor_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Shane_Farritor_tiny.jpg
rename to plugins/customindex/witw_icons/Shane_Farritor_tiny.jpg
diff --git a/customindex/witw_icons/Sheri_Fritz.jpg b/plugins/customindex/witw_icons/Sheri_Fritz.jpg
similarity index 100%
rename from customindex/witw_icons/Sheri_Fritz.jpg
rename to plugins/customindex/witw_icons/Sheri_Fritz.jpg
diff --git a/customindex/witw_icons/Sheri_Fritz_medium.jpg b/plugins/customindex/witw_icons/Sheri_Fritz_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Sheri_Fritz_medium.jpg
rename to plugins/customindex/witw_icons/Sheri_Fritz_medium.jpg
diff --git a/customindex/witw_icons/Sheri_Fritz_tiny.jpg b/plugins/customindex/witw_icons/Sheri_Fritz_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Sheri_Fritz_tiny.jpg
rename to plugins/customindex/witw_icons/Sheri_Fritz_tiny.jpg
diff --git a/customindex/witw_icons/Sidnie_White-Crawford.jpg b/plugins/customindex/witw_icons/Sidnie_White-Crawford.jpg
similarity index 100%
rename from customindex/witw_icons/Sidnie_White-Crawford.jpg
rename to plugins/customindex/witw_icons/Sidnie_White-Crawford.jpg
diff --git a/customindex/witw_icons/Sidnie_White-Crawford_medium.jpg b/plugins/customindex/witw_icons/Sidnie_White-Crawford_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Sidnie_White-Crawford_medium.jpg
rename to plugins/customindex/witw_icons/Sidnie_White-Crawford_medium.jpg
diff --git a/customindex/witw_icons/Sidnie_White-Crawford_tiny.jpg b/plugins/customindex/witw_icons/Sidnie_White-Crawford_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Sidnie_White-Crawford_tiny.jpg
rename to plugins/customindex/witw_icons/Sidnie_White-Crawford_tiny.jpg
diff --git a/customindex/witw_icons/Ted_Sorensen.jpg b/plugins/customindex/witw_icons/Ted_Sorensen.jpg
similarity index 100%
rename from customindex/witw_icons/Ted_Sorensen.jpg
rename to plugins/customindex/witw_icons/Ted_Sorensen.jpg
diff --git a/customindex/witw_icons/Ted_Sorensen_medium.jpg b/plugins/customindex/witw_icons/Ted_Sorensen_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Ted_Sorensen_medium.jpg
rename to plugins/customindex/witw_icons/Ted_Sorensen_medium.jpg
diff --git a/customindex/witw_icons/Ted_Sorensen_tiny.jpg b/plugins/customindex/witw_icons/Ted_Sorensen_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Ted_Sorensen_tiny.jpg
rename to plugins/customindex/witw_icons/Ted_Sorensen_tiny.jpg
diff --git a/customindex/witw_icons/Trischa_Zorn-Hudson.jpg b/plugins/customindex/witw_icons/Trischa_Zorn-Hudson.jpg
similarity index 100%
rename from customindex/witw_icons/Trischa_Zorn-Hudson.jpg
rename to plugins/customindex/witw_icons/Trischa_Zorn-Hudson.jpg
diff --git a/customindex/witw_icons/Trischa_Zorn-Hudson_medium.jpg b/plugins/customindex/witw_icons/Trischa_Zorn-Hudson_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Trischa_Zorn-Hudson_medium.jpg
rename to plugins/customindex/witw_icons/Trischa_Zorn-Hudson_medium.jpg
diff --git a/customindex/witw_icons/Trischa_Zorn-Hudson_tiny.jpg b/plugins/customindex/witw_icons/Trischa_Zorn-Hudson_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Trischa_Zorn-Hudson_tiny.jpg
rename to plugins/customindex/witw_icons/Trischa_Zorn-Hudson_tiny.jpg
diff --git a/customindex/witw_icons/Warren_Buffett.jpg b/plugins/customindex/witw_icons/Warren_Buffett.jpg
similarity index 100%
rename from customindex/witw_icons/Warren_Buffett.jpg
rename to plugins/customindex/witw_icons/Warren_Buffett.jpg
diff --git a/customindex/witw_icons/Warren_Buffett_medium.jpg b/plugins/customindex/witw_icons/Warren_Buffett_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Warren_Buffett_medium.jpg
rename to plugins/customindex/witw_icons/Warren_Buffett_medium.jpg
diff --git a/customindex/witw_icons/Warren_Buffett_tiny.jpg b/plugins/customindex/witw_icons/Warren_Buffett_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Warren_Buffett_tiny.jpg
rename to plugins/customindex/witw_icons/Warren_Buffett_tiny.jpg
diff --git a/customindex/witw_icons/Xun-Hong_Chen.jpg b/plugins/customindex/witw_icons/Xun-Hong_Chen.jpg
similarity index 100%
rename from customindex/witw_icons/Xun-Hong_Chen.jpg
rename to plugins/customindex/witw_icons/Xun-Hong_Chen.jpg
diff --git a/customindex/witw_icons/Xun-Hong_Chen_medium.jpg b/plugins/customindex/witw_icons/Xun-Hong_Chen_medium.jpg
similarity index 100%
rename from customindex/witw_icons/Xun-Hong_Chen_medium.jpg
rename to plugins/customindex/witw_icons/Xun-Hong_Chen_medium.jpg
diff --git a/customindex/witw_icons/Xun-Hong_Chen_tiny.jpg b/plugins/customindex/witw_icons/Xun-Hong_Chen_tiny.jpg
similarity index 100%
rename from customindex/witw_icons/Xun-Hong_Chen_tiny.jpg
rename to plugins/customindex/witw_icons/Xun-Hong_Chen_tiny.jpg
diff --git a/customindex/witw_people.js b/plugins/customindex/witw_people.js
similarity index 100%
rename from customindex/witw_people.js
rename to plugins/customindex/witw_people.js
diff --git a/unl_theme/actions/login.php b/plugins/unl_theme/actions/login.php
similarity index 100%
rename from unl_theme/actions/login.php
rename to plugins/unl_theme/actions/login.php
diff --git a/unl_theme/globe.shtml b/plugins/unl_theme/globe.shtml
similarity index 100%
rename from unl_theme/globe.shtml
rename to plugins/unl_theme/globe.shtml
diff --git a/unl_theme/globetest.shtml b/plugins/unl_theme/globetest.shtml
similarity index 100%
rename from unl_theme/globetest.shtml
rename to plugins/unl_theme/globetest.shtml
diff --git a/unl_theme/languages/en.php b/plugins/unl_theme/languages/en.php
similarity index 100%
rename from unl_theme/languages/en.php
rename to plugins/unl_theme/languages/en.php
diff --git a/unl_theme/manifest.xml b/plugins/unl_theme/manifest.xml
similarity index 100%
rename from unl_theme/manifest.xml
rename to plugins/unl_theme/manifest.xml
diff --git a/unl_theme/mod/messages/views/default/messages/topbar.php b/plugins/unl_theme/mod/messages/views/default/messages/topbar.php
similarity index 100%
rename from unl_theme/mod/messages/views/default/messages/topbar.php
rename to plugins/unl_theme/mod/messages/views/default/messages/topbar.php
diff --git a/unl_theme/mod/notifications/languages/en.php b/plugins/unl_theme/mod/notifications/languages/en.php
similarity index 100%
rename from unl_theme/mod/notifications/languages/en.php
rename to plugins/unl_theme/mod/notifications/languages/en.php
diff --git a/unl_theme/scripts/JS/actionNotice.js b/plugins/unl_theme/scripts/JS/actionNotice.js
similarity index 100%
rename from unl_theme/scripts/JS/actionNotice.js
rename to plugins/unl_theme/scripts/JS/actionNotice.js
diff --git a/unl_theme/scripts/JS/enhanceProfileForm.php b/plugins/unl_theme/scripts/JS/enhanceProfileForm.php
similarity index 100%
rename from unl_theme/scripts/JS/enhanceProfileForm.php
rename to plugins/unl_theme/scripts/JS/enhanceProfileForm.php
diff --git a/unl_theme/scripts/JS/social.js b/plugins/unl_theme/scripts/JS/social.js
similarity index 100%
rename from unl_theme/scripts/JS/social.js
rename to plugins/unl_theme/scripts/JS/social.js
diff --git a/unl_theme/scripts/badwordfilter.php b/plugins/unl_theme/scripts/badwordfilter.php
similarity index 100%
rename from unl_theme/scripts/badwordfilter.php
rename to plugins/unl_theme/scripts/badwordfilter.php
diff --git a/unl_theme/scripts/globe.html b/plugins/unl_theme/scripts/globe.html
similarity index 100%
rename from unl_theme/scripts/globe.html
rename to plugins/unl_theme/scripts/globe.html
diff --git a/unl_theme/scripts/globetest.shtml b/plugins/unl_theme/scripts/globetest.shtml
similarity index 100%
rename from unl_theme/scripts/globetest.shtml
rename to plugins/unl_theme/scripts/globetest.shtml
diff --git a/unl_theme/scripts/jquery.tools.min.js b/plugins/unl_theme/scripts/jquery.tools.min.js
similarity index 100%
rename from unl_theme/scripts/jquery.tools.min.js
rename to plugins/unl_theme/scripts/jquery.tools.min.js
diff --git a/unl_theme/scripts/latlon.php b/plugins/unl_theme/scripts/latlon.php
similarity index 100%
rename from unl_theme/scripts/latlon.php
rename to plugins/unl_theme/scripts/latlon.php
diff --git a/unl_theme/scripts/newfile.php b/plugins/unl_theme/scripts/newfile.php
similarity index 100%
rename from unl_theme/scripts/newfile.php
rename to plugins/unl_theme/scripts/newfile.php
diff --git a/unl_theme/start.php b/plugins/unl_theme/start.php
similarity index 100%
rename from unl_theme/start.php
rename to plugins/unl_theme/start.php
diff --git a/unl_theme/views/default/account/forms/forgotten_password.php b/plugins/unl_theme/views/default/account/forms/forgotten_password.php
similarity index 100%
rename from unl_theme/views/default/account/forms/forgotten_password.php
rename to plugins/unl_theme/views/default/account/forms/forgotten_password.php
diff --git a/unl_theme/views/default/account/forms/login.php b/plugins/unl_theme/views/default/account/forms/login.php
similarity index 100%
rename from unl_theme/views/default/account/forms/login.php
rename to plugins/unl_theme/views/default/account/forms/login.php
diff --git a/unl_theme/views/default/account/forms/register.php b/plugins/unl_theme/views/default/account/forms/register.php
similarity index 100%
rename from unl_theme/views/default/account/forms/register.php
rename to plugins/unl_theme/views/default/account/forms/register.php
diff --git a/unl_theme/views/default/css.php b/plugins/unl_theme/views/default/css.php
similarity index 100%
rename from unl_theme/views/default/css.php
rename to plugins/unl_theme/views/default/css.php
diff --git a/unl_theme/views/default/images/magnifyingGlass.png b/plugins/unl_theme/views/default/images/magnifyingGlass.png
similarity index 100%
rename from unl_theme/views/default/images/magnifyingGlass.png
rename to plugins/unl_theme/views/default/images/magnifyingGlass.png
diff --git a/unl_theme/views/default/images/wdn_notice_ActionBG.png b/plugins/unl_theme/views/default/images/wdn_notice_ActionBG.png
similarity index 100%
rename from unl_theme/views/default/images/wdn_notice_ActionBG.png
rename to plugins/unl_theme/views/default/images/wdn_notice_ActionBG.png
diff --git a/unl_theme/views/default/images/wdn_notice_BG.png b/plugins/unl_theme/views/default/images/wdn_notice_BG.png
similarity index 100%
rename from unl_theme/views/default/images/wdn_notice_BG.png
rename to plugins/unl_theme/views/default/images/wdn_notice_BG.png
diff --git a/unl_theme/views/default/images/wdn_notice_EarthIcon.png b/plugins/unl_theme/views/default/images/wdn_notice_EarthIcon.png
similarity index 100%
rename from unl_theme/views/default/images/wdn_notice_EarthIcon.png
rename to plugins/unl_theme/views/default/images/wdn_notice_EarthIcon.png
diff --git a/unl_theme/views/default/page_elements/elgg_topbar.php b/plugins/unl_theme/views/default/page_elements/elgg_topbar.php
similarity index 100%
rename from unl_theme/views/default/page_elements/elgg_topbar.php
rename to plugins/unl_theme/views/default/page_elements/elgg_topbar.php
diff --git a/unl_theme/views/default/page_elements/footer.php b/plugins/unl_theme/views/default/page_elements/footer.php
similarity index 100%
rename from unl_theme/views/default/page_elements/footer.php
rename to plugins/unl_theme/views/default/page_elements/footer.php
diff --git a/unl_theme/views/default/page_elements/header.php b/plugins/unl_theme/views/default/page_elements/header.php
similarity index 100%
rename from unl_theme/views/default/page_elements/header.php
rename to plugins/unl_theme/views/default/page_elements/header.php
diff --git a/unl_theme/views/default/page_elements/unl_nav.php b/plugins/unl_theme/views/default/page_elements/unl_nav.php
similarity index 100%
rename from unl_theme/views/default/page_elements/unl_nav.php
rename to plugins/unl_theme/views/default/page_elements/unl_nav.php
diff --git a/unl_theme/views/default/pageshells/pageshell.php b/plugins/unl_theme/views/default/pageshells/pageshell.php
similarity index 100%
rename from unl_theme/views/default/pageshells/pageshell.php
rename to plugins/unl_theme/views/default/pageshells/pageshell.php
diff --git a/setup.sh b/setup.sh
index 30065e8492a3231ec39c0928bd43d22e9316c2e5..85f06154a058fef7e9657ddd6922393582b9b613 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,14 +1,10 @@
 # Make a directory for elgg data files outside the root
 mkdir elgg_data
 
-cd elgg/mod
-
-# Our Plugins
-ln -s ../../customindex customindex
-ln -s ../../unl_theme unl_theme
+ 
 
 #Do patches
-cd ../
+cd elgg
 patch -p0 < ../patches/lowercase_post.diff