diff --git a/disable-workspace-switcher/LICENSE b/extensions/disable-workspace-switcher/LICENSE
similarity index 100%
rename from disable-workspace-switcher/LICENSE
rename to extensions/disable-workspace-switcher/LICENSE
diff --git a/disable-workspace-switcher/README.md b/extensions/disable-workspace-switcher/README.md
similarity index 100%
rename from disable-workspace-switcher/README.md
rename to extensions/disable-workspace-switcher/README.md
diff --git a/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/extension.js b/extensions/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/extension.js
similarity index 100%
rename from disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/extension.js
rename to extensions/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/extension.js
diff --git a/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/metadata.json b/extensions/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/metadata.json
similarity index 100%
rename from disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/metadata.json
rename to extensions/disable-workspace-switcher/disable-workspace-switcher@jbradaric.me/metadata.json
diff --git a/hibernate-status/.gitignore b/extensions/hibernate-status/.gitignore
similarity index 100%
rename from hibernate-status/.gitignore
rename to extensions/hibernate-status/.gitignore
diff --git a/hibernate-status/LICENSE b/extensions/hibernate-status/LICENSE
similarity index 100%
rename from hibernate-status/LICENSE
rename to extensions/hibernate-status/LICENSE
diff --git a/hibernate-status/Makefile b/extensions/hibernate-status/Makefile
similarity index 100%
rename from hibernate-status/Makefile
rename to extensions/hibernate-status/Makefile
diff --git a/hibernate-status/README.md b/extensions/hibernate-status/README.md
similarity index 100%
rename from hibernate-status/README.md
rename to extensions/hibernate-status/README.md
diff --git a/hibernate-status/buildforupload.sh b/extensions/hibernate-status/buildforupload.sh
similarity index 100%
rename from hibernate-status/buildforupload.sh
rename to extensions/hibernate-status/buildforupload.sh
diff --git a/hibernate-status/confirmDialog.js b/extensions/hibernate-status/confirmDialog.js
similarity index 100%
rename from hibernate-status/confirmDialog.js
rename to extensions/hibernate-status/confirmDialog.js
diff --git a/hibernate-status/extension.js b/extensions/hibernate-status/extension.js
similarity index 100%
rename from hibernate-status/extension.js
rename to extensions/hibernate-status/extension.js
diff --git a/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/cs/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/de/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/es/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/fa/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/fr/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/it/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/nl/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/oc/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/pl/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/pt/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/pt_BR/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/ru/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/uk/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po b/extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
similarity index 100%
rename from hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
rename to extensions/hibernate-status/locale/zh_CN/LC_MESSAGES/hibernate-status-button.po
diff --git a/hibernate-status/metadata.json b/extensions/hibernate-status/metadata.json
similarity index 100%
rename from hibernate-status/metadata.json
rename to extensions/hibernate-status/metadata.json
diff --git a/hibernate-status/prefs.js b/extensions/hibernate-status/prefs.js
similarity index 100%
rename from hibernate-status/prefs.js
rename to extensions/hibernate-status/prefs.js
diff --git a/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml b/extensions/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml
similarity index 100%
rename from hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml
rename to extensions/hibernate-status/schemas/org.gnome.shell.extensions.hibernate-status-button.gschema.xml
diff --git a/multi-monitors-add-on/.project b/extensions/multi-monitors-add-on/.project
similarity index 100%
rename from multi-monitors-add-on/.project
rename to extensions/multi-monitors-add-on/.project
diff --git a/multi-monitors-add-on/LICENSE b/extensions/multi-monitors-add-on/LICENSE
similarity index 100%
rename from multi-monitors-add-on/LICENSE
rename to extensions/multi-monitors-add-on/LICENSE
diff --git a/multi-monitors-add-on/README.md b/extensions/multi-monitors-add-on/README.md
similarity index 100%
rename from multi-monitors-add-on/README.md
rename to extensions/multi-monitors-add-on/README.md
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/convenience.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/convenience.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/convenience.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/convenience.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/extension.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/extension.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/extension.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/extension.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-l-symbolic.svg b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-l-symbolic.svg
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-l-symbolic.svg
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-l-symbolic.svg
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-r-symbolic.svg b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-r-symbolic.svg
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-r-symbolic.svg
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/icons/multi-monitors-r-symbolic.svg
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/indicator.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/indicator.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/indicator.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/indicator.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/de/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/es/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/fr/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/it/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pl/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.mo b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.mo
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.mo
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.mo
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.po b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.po
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.po
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/locale/pt_BR/LC_MESSAGES/multi-monitors-add-on.po
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/metadata.json b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/metadata.json
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/metadata.json
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/metadata.json
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/mmcalendar.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmcalendar.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/mmcalendar.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmcalendar.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/mmlayout.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmlayout.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/mmlayout.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmlayout.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/mmoverview.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmoverview.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/mmoverview.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmoverview.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/mmpanel.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmpanel.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/mmpanel.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/mmpanel.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/multi-monitors-add-on.pot b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/multi-monitors-add-on.pot
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/multi-monitors-add-on.pot
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/multi-monitors-add-on.pot
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/prefs.js b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/prefs.js
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/prefs.js
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/prefs.js
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/gschemas.compiled b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/gschemas.compiled
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/gschemas.compiled
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/gschemas.compiled
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/org.gnome.shell.extensions.multi-monitors-add-on.gschema.xml b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/org.gnome.shell.extensions.multi-monitors-add-on.gschema.xml
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/org.gnome.shell.extensions.multi-monitors-add-on.gschema.xml
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/schemas/org.gnome.shell.extensions.multi-monitors-add-on.gschema.xml
diff --git a/multi-monitors-add-on/multi-monitors-add-on@spin83/stylesheet.css b/extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/stylesheet.css
similarity index 100%
rename from multi-monitors-add-on/multi-monitors-add-on@spin83/stylesheet.css
rename to extensions/multi-monitors-add-on/multi-monitors-add-on@spin83/stylesheet.css