diff --git a/mu-plugins/_loader.php b/mu-plugins/_loader.php
index a7eff56a..7c536844 100644
--- a/mu-plugins/_loader.php
+++ b/mu-plugins/_loader.php
@@ -1,5 +1,5 @@
 <?php
 
 // Enabled everywhere
-require_once WPMU_PLUGIN_DIR . '/relevanssi/relevanssi.php';
-require 'disable-emojis/disable-emojis.php';
+require_once __DIR__ . '/../relevanssi/relevanssi.php';
+require_once __DIR__ . '/../disable-emojis/disable-emojis.php';
diff --git a/mu-plugins/disable-emojis b/mu-plugins/disable-emojis
new file mode 120000
index 00000000..f9c53aef
--- /dev/null
+++ b/mu-plugins/disable-emojis
@@ -0,0 +1 @@
+../plugins/disable-emojis
\ No newline at end of file
diff --git a/mu-plugins/relevanssi b/mu-plugins/relevanssi
new file mode 120000
index 00000000..5c686530
--- /dev/null
+++ b/mu-plugins/relevanssi
@@ -0,0 +1 @@
+../plugins/relevanssi
\ No newline at end of file
diff --git a/mu-plugins/disable-emojis/disable-emojis.php b/plugins/disable-emojis/disable-emojis.php
old mode 100755
new mode 100644
similarity index 100%
rename from mu-plugins/disable-emojis/disable-emojis.php
rename to plugins/disable-emojis/disable-emojis.php
diff --git a/mu-plugins/disable-emojis/license.txt b/plugins/disable-emojis/license.txt
old mode 100755
new mode 100644
similarity index 100%
rename from mu-plugins/disable-emojis/license.txt
rename to plugins/disable-emojis/license.txt
diff --git a/mu-plugins/disable-emojis/readme.txt b/plugins/disable-emojis/readme.txt
old mode 100755
new mode 100644
similarity index 100%
rename from mu-plugins/disable-emojis/readme.txt
rename to plugins/disable-emojis/readme.txt
diff --git a/plugins/index.php b/plugins/index.php
old mode 100755
new mode 100644
diff --git a/mu-plugins/relevanssi/LICENSE b/plugins/relevanssi/LICENSE
similarity index 100%
rename from mu-plugins/relevanssi/LICENSE
rename to plugins/relevanssi/LICENSE
diff --git a/mu-plugins/relevanssi/README.md b/plugins/relevanssi/README.md
similarity index 100%
rename from mu-plugins/relevanssi/README.md
rename to plugins/relevanssi/README.md
diff --git a/mu-plugins/relevanssi/delete.png b/plugins/relevanssi/delete.png
similarity index 100%
rename from mu-plugins/relevanssi/delete.png
rename to plugins/relevanssi/delete.png
diff --git a/mu-plugins/relevanssi/facebooklogo.jpg b/plugins/relevanssi/facebooklogo.jpg
similarity index 100%
rename from mu-plugins/relevanssi/facebooklogo.jpg
rename to plugins/relevanssi/facebooklogo.jpg
diff --git a/mu-plugins/relevanssi/lib/common.php b/plugins/relevanssi/lib/common.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/common.php
rename to plugins/relevanssi/lib/common.php
diff --git a/mu-plugins/relevanssi/lib/excerpts-highlights.php b/plugins/relevanssi/lib/excerpts-highlights.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/excerpts-highlights.php
rename to plugins/relevanssi/lib/excerpts-highlights.php
diff --git a/mu-plugins/relevanssi/lib/indexing.php b/plugins/relevanssi/lib/indexing.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/indexing.php
rename to plugins/relevanssi/lib/indexing.php
diff --git a/mu-plugins/relevanssi/lib/init.php b/plugins/relevanssi/lib/init.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/init.php
rename to plugins/relevanssi/lib/init.php
diff --git a/mu-plugins/relevanssi/lib/interface.php b/plugins/relevanssi/lib/interface.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/interface.php
rename to plugins/relevanssi/lib/interface.php
diff --git a/mu-plugins/relevanssi/lib/search.php b/plugins/relevanssi/lib/search.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/search.php
rename to plugins/relevanssi/lib/search.php
diff --git a/mu-plugins/relevanssi/lib/shortcodes.php b/plugins/relevanssi/lib/shortcodes.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/shortcodes.php
rename to plugins/relevanssi/lib/shortcodes.php
diff --git a/mu-plugins/relevanssi/lib/stopwords.php b/plugins/relevanssi/lib/stopwords.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/stopwords.php
rename to plugins/relevanssi/lib/stopwords.php
diff --git a/mu-plugins/relevanssi/lib/uninstall.php b/plugins/relevanssi/lib/uninstall.php
similarity index 100%
rename from mu-plugins/relevanssi/lib/uninstall.php
rename to plugins/relevanssi/lib/uninstall.php
diff --git a/mu-plugins/relevanssi/readme.txt b/plugins/relevanssi/readme.txt
similarity index 100%
rename from mu-plugins/relevanssi/readme.txt
rename to plugins/relevanssi/readme.txt
diff --git a/mu-plugins/relevanssi/relevanssi-cz_CZ.mo b/plugins/relevanssi/relevanssi-cz_CZ.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-cz_CZ.mo
rename to plugins/relevanssi/relevanssi-cz_CZ.mo
diff --git a/mu-plugins/relevanssi/relevanssi-cz_CZ.po b/plugins/relevanssi/relevanssi-cz_CZ.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-cz_CZ.po
rename to plugins/relevanssi/relevanssi-cz_CZ.po
diff --git a/mu-plugins/relevanssi/relevanssi-de_DE.mo b/plugins/relevanssi/relevanssi-de_DE.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-de_DE.mo
rename to plugins/relevanssi/relevanssi-de_DE.mo
diff --git a/mu-plugins/relevanssi/relevanssi-de_DE.po b/plugins/relevanssi/relevanssi-de_DE.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-de_DE.po
rename to plugins/relevanssi/relevanssi-de_DE.po
diff --git a/mu-plugins/relevanssi/relevanssi-fr_FR.mo b/plugins/relevanssi/relevanssi-fr_FR.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-fr_FR.mo
rename to plugins/relevanssi/relevanssi-fr_FR.mo
diff --git a/mu-plugins/relevanssi/relevanssi-fr_FR.po b/plugins/relevanssi/relevanssi-fr_FR.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-fr_FR.po
rename to plugins/relevanssi/relevanssi-fr_FR.po
diff --git a/mu-plugins/relevanssi/relevanssi-it_IT.mo b/plugins/relevanssi/relevanssi-it_IT.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-it_IT.mo
rename to plugins/relevanssi/relevanssi-it_IT.mo
diff --git a/mu-plugins/relevanssi/relevanssi-it_IT.po b/plugins/relevanssi/relevanssi-it_IT.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-it_IT.po
rename to plugins/relevanssi/relevanssi-it_IT.po
diff --git a/mu-plugins/relevanssi/relevanssi-pl_PL.mo b/plugins/relevanssi/relevanssi-pl_PL.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-pl_PL.mo
rename to plugins/relevanssi/relevanssi-pl_PL.mo
diff --git a/mu-plugins/relevanssi/relevanssi-pl_PL.po b/plugins/relevanssi/relevanssi-pl_PL.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-pl_PL.po
rename to plugins/relevanssi/relevanssi-pl_PL.po
diff --git a/mu-plugins/relevanssi/relevanssi-pt_BR.mo b/plugins/relevanssi/relevanssi-pt_BR.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-pt_BR.mo
rename to plugins/relevanssi/relevanssi-pt_BR.mo
diff --git a/mu-plugins/relevanssi/relevanssi-pt_BR.po b/plugins/relevanssi/relevanssi-pt_BR.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-pt_BR.po
rename to plugins/relevanssi/relevanssi-pt_BR.po
diff --git a/mu-plugins/relevanssi/relevanssi-ro_RO.mo b/plugins/relevanssi/relevanssi-ro_RO.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-ro_RO.mo
rename to plugins/relevanssi/relevanssi-ro_RO.mo
diff --git a/mu-plugins/relevanssi/relevanssi-ro_RO.po b/plugins/relevanssi/relevanssi-ro_RO.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-ro_RO.po
rename to plugins/relevanssi/relevanssi-ro_RO.po
diff --git a/mu-plugins/relevanssi/relevanssi-ru_RU.mo b/plugins/relevanssi/relevanssi-ru_RU.mo
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-ru_RU.mo
rename to plugins/relevanssi/relevanssi-ru_RU.mo
diff --git a/mu-plugins/relevanssi/relevanssi-ru_RU.po b/plugins/relevanssi/relevanssi-ru_RU.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi-ru_RU.po
rename to plugins/relevanssi/relevanssi-ru_RU.po
diff --git a/mu-plugins/relevanssi/relevanssi.php b/plugins/relevanssi/relevanssi.php
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi.php
rename to plugins/relevanssi/relevanssi.php
diff --git a/mu-plugins/relevanssi/relevanssi.po b/plugins/relevanssi/relevanssi.po
similarity index 100%
rename from mu-plugins/relevanssi/relevanssi.po
rename to plugins/relevanssi/relevanssi.po
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.cs_CZ b/plugins/relevanssi/stopwords/stopwords.cs_CZ
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.cs_CZ
rename to plugins/relevanssi/stopwords/stopwords.cs_CZ
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.de_DE b/plugins/relevanssi/stopwords/stopwords.de_DE
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.de_DE
rename to plugins/relevanssi/stopwords/stopwords.de_DE
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.en_GB b/plugins/relevanssi/stopwords/stopwords.en_GB
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.en_GB
rename to plugins/relevanssi/stopwords/stopwords.en_GB
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.en_US b/plugins/relevanssi/stopwords/stopwords.en_US
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.en_US
rename to plugins/relevanssi/stopwords/stopwords.en_US
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.es_ES b/plugins/relevanssi/stopwords/stopwords.es_ES
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.es_ES
rename to plugins/relevanssi/stopwords/stopwords.es_ES
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.fi b/plugins/relevanssi/stopwords/stopwords.fi
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.fi
rename to plugins/relevanssi/stopwords/stopwords.fi
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.fr_FR b/plugins/relevanssi/stopwords/stopwords.fr_FR
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.fr_FR
rename to plugins/relevanssi/stopwords/stopwords.fr_FR
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.pl_PL b/plugins/relevanssi/stopwords/stopwords.pl_PL
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.pl_PL
rename to plugins/relevanssi/stopwords/stopwords.pl_PL
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.pt_BR b/plugins/relevanssi/stopwords/stopwords.pt_BR
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.pt_BR
rename to plugins/relevanssi/stopwords/stopwords.pt_BR
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.pt_PT b/plugins/relevanssi/stopwords/stopwords.pt_PT
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.pt_PT
rename to plugins/relevanssi/stopwords/stopwords.pt_PT
diff --git a/mu-plugins/relevanssi/stopwords/stopwords.ru_RU b/plugins/relevanssi/stopwords/stopwords.ru_RU
similarity index 100%
rename from mu-plugins/relevanssi/stopwords/stopwords.ru_RU
rename to plugins/relevanssi/stopwords/stopwords.ru_RU
diff --git a/mu-plugins/relevanssi/uninstall.php b/plugins/relevanssi/uninstall.php
similarity index 100%
rename from mu-plugins/relevanssi/uninstall.php
rename to plugins/relevanssi/uninstall.php