diff --git a/volatility/plugins/configwriter.py b/volatility/framework/plugins/configwriter.py
similarity index 100%
rename from volatility/plugins/configwriter.py
rename to volatility/framework/plugins/configwriter.py
diff --git a/volatility/plugins/linux/bash.py b/volatility/framework/plugins/linux/bash.py
similarity index 100%
rename from volatility/plugins/linux/bash.py
rename to volatility/framework/plugins/linux/bash.py
diff --git a/volatility/plugins/linux/check_afinfo.py b/volatility/framework/plugins/linux/check_afinfo.py
similarity index 100%
rename from volatility/plugins/linux/check_afinfo.py
rename to volatility/framework/plugins/linux/check_afinfo.py
diff --git a/volatility/plugins/linux/check_syscall.py b/volatility/framework/plugins/linux/check_syscall.py
similarity index 100%
rename from volatility/plugins/linux/check_syscall.py
rename to volatility/framework/plugins/linux/check_syscall.py
diff --git a/volatility/plugins/linux/elfs.py b/volatility/framework/plugins/linux/elfs.py
similarity index 100%
rename from volatility/plugins/linux/elfs.py
rename to volatility/framework/plugins/linux/elfs.py
diff --git a/volatility/plugins/linux/lsmod.py b/volatility/framework/plugins/linux/lsmod.py
similarity index 100%
rename from volatility/plugins/linux/lsmod.py
rename to volatility/framework/plugins/linux/lsmod.py
diff --git a/volatility/plugins/linux/lsof.py b/volatility/framework/plugins/linux/lsof.py
similarity index 100%
rename from volatility/plugins/linux/lsof.py
rename to volatility/framework/plugins/linux/lsof.py
diff --git a/volatility/plugins/linux/malfind.py b/volatility/framework/plugins/linux/malfind.py
similarity index 100%
rename from volatility/plugins/linux/malfind.py
rename to volatility/framework/plugins/linux/malfind.py
diff --git a/volatility/plugins/linux/proc.py b/volatility/framework/plugins/linux/proc.py
similarity index 100%
rename from volatility/plugins/linux/proc.py
rename to volatility/framework/plugins/linux/proc.py
diff --git a/volatility/plugins/linux/pslist.py b/volatility/framework/plugins/linux/pslist.py
similarity index 100%
rename from volatility/plugins/linux/pslist.py
rename to volatility/framework/plugins/linux/pslist.py
diff --git a/volatility/plugins/linux/pstree.py b/volatility/framework/plugins/linux/pstree.py
similarity index 100%
rename from volatility/plugins/linux/pstree.py
rename to volatility/framework/plugins/linux/pstree.py
diff --git a/volatility/plugins/mac/psaux.py b/volatility/framework/plugins/mac/psaux.py
similarity index 100%
rename from volatility/plugins/mac/psaux.py
rename to volatility/framework/plugins/mac/psaux.py
diff --git a/volatility/plugins/mac/pslist.py b/volatility/framework/plugins/mac/pslist.py
similarity index 100%
rename from volatility/plugins/mac/pslist.py
rename to volatility/framework/plugins/mac/pslist.py
diff --git a/volatility/plugins/timeliner.py b/volatility/framework/plugins/timeliner.py
similarity index 100%
rename from volatility/plugins/timeliner.py
rename to volatility/framework/plugins/timeliner.py
diff --git a/volatility/plugins/windows/cmdline.py b/volatility/framework/plugins/windows/cmdline.py
similarity index 100%
rename from volatility/plugins/windows/cmdline.py
rename to volatility/framework/plugins/windows/cmdline.py
diff --git a/volatility/plugins/windows/dlldump.py b/volatility/framework/plugins/windows/dlldump.py
similarity index 100%
rename from volatility/plugins/windows/dlldump.py
rename to volatility/framework/plugins/windows/dlldump.py
diff --git a/volatility/plugins/windows/dlllist.py b/volatility/framework/plugins/windows/dlllist.py
similarity index 100%
rename from volatility/plugins/windows/dlllist.py
rename to volatility/framework/plugins/windows/dlllist.py
diff --git a/volatility/plugins/windows/handles.py b/volatility/framework/plugins/windows/handles.py
similarity index 100%
rename from volatility/plugins/windows/handles.py
rename to volatility/framework/plugins/windows/handles.py
diff --git a/volatility/plugins/windows/info.py b/volatility/framework/plugins/windows/info.py
similarity index 100%
rename from volatility/plugins/windows/info.py
rename to volatility/framework/plugins/windows/info.py
diff --git a/volatility/plugins/windows/malfind.py b/volatility/framework/plugins/windows/malfind.py
similarity index 100%
rename from volatility/plugins/windows/malfind.py
rename to volatility/framework/plugins/windows/malfind.py
diff --git a/volatility/plugins/windows/moddump.py b/volatility/framework/plugins/windows/moddump.py
similarity index 100%
rename from volatility/plugins/windows/moddump.py
rename to volatility/framework/plugins/windows/moddump.py
diff --git a/volatility/plugins/windows/modules.py b/volatility/framework/plugins/windows/modules.py
similarity index 100%
rename from volatility/plugins/windows/modules.py
rename to volatility/framework/plugins/windows/modules.py
diff --git a/volatility/plugins/windows/poolscanner.py b/volatility/framework/plugins/windows/poolscanner.py
similarity index 100%
rename from volatility/plugins/windows/poolscanner.py
rename to volatility/framework/plugins/windows/poolscanner.py
diff --git a/volatility/plugins/windows/procdump.py b/volatility/framework/plugins/windows/procdump.py
similarity index 100%
rename from volatility/plugins/windows/procdump.py
rename to volatility/framework/plugins/windows/procdump.py
diff --git a/volatility/plugins/windows/pslist.py b/volatility/framework/plugins/windows/pslist.py
similarity index 100%
rename from volatility/plugins/windows/pslist.py
rename to volatility/framework/plugins/windows/pslist.py
diff --git a/volatility/plugins/windows/pstree.py b/volatility/framework/plugins/windows/pstree.py
similarity index 100%
rename from volatility/plugins/windows/pstree.py
rename to volatility/framework/plugins/windows/pstree.py
diff --git a/volatility/plugins/windows/registry/hivelist.py b/volatility/framework/plugins/windows/registry/hivelist.py
similarity index 100%
rename from volatility/plugins/windows/registry/hivelist.py
rename to volatility/framework/plugins/windows/registry/hivelist.py
diff --git a/volatility/plugins/windows/registry/printkey.py b/volatility/framework/plugins/windows/registry/printkey.py
similarity index 100%
rename from volatility/plugins/windows/registry/printkey.py
rename to volatility/framework/plugins/windows/registry/printkey.py
diff --git a/volatility/plugins/windows/registry/userassist.json b/volatility/framework/plugins/windows/registry/userassist.json
similarity index 100%
rename from volatility/plugins/windows/registry/userassist.json
rename to volatility/framework/plugins/windows/registry/userassist.json
diff --git a/volatility/plugins/windows/registry/userassist.py b/volatility/framework/plugins/windows/registry/userassist.py
similarity index 100%
rename from volatility/plugins/windows/registry/userassist.py
rename to volatility/framework/plugins/windows/registry/userassist.py
diff --git a/volatility/plugins/windows/ssdt.py b/volatility/framework/plugins/windows/ssdt.py
similarity index 100%
rename from volatility/plugins/windows/ssdt.py
rename to volatility/framework/plugins/windows/ssdt.py
diff --git a/volatility/plugins/windows/strings.py b/volatility/framework/plugins/windows/strings.py
similarity index 100%
rename from volatility/plugins/windows/strings.py
rename to volatility/framework/plugins/windows/strings.py
diff --git a/volatility/plugins/windows/vaddump.py b/volatility/framework/plugins/windows/vaddump.py
similarity index 100%
rename from volatility/plugins/windows/vaddump.py
rename to volatility/framework/plugins/windows/vaddump.py
diff --git a/volatility/plugins/windows/vadinfo.py b/volatility/framework/plugins/windows/vadinfo.py
similarity index 100%
rename from volatility/plugins/windows/vadinfo.py
rename to volatility/framework/plugins/windows/vadinfo.py
diff --git a/volatility/plugins/windows/vadyarascan.py b/volatility/framework/plugins/windows/vadyarascan.py
similarity index 100%
rename from volatility/plugins/windows/vadyarascan.py
rename to volatility/framework/plugins/windows/vadyarascan.py
diff --git a/volatility/plugins/windows/verinfo.py b/volatility/framework/plugins/windows/verinfo.py
similarity index 100%
rename from volatility/plugins/windows/verinfo.py
rename to volatility/framework/plugins/windows/verinfo.py
diff --git a/volatility/plugins/yarascan.py b/volatility/framework/plugins/yarascan.py
similarity index 100%
rename from volatility/plugins/yarascan.py
rename to volatility/framework/plugins/yarascan.py
diff --git a/volatility/plugins/mac/__init__.py b/volatility/plugins/mac/__init__.py
new file mode 100644
index 000000000..1fa00fd77
--- /dev/null
+++ b/volatility/plugins/mac/__init__.py
@@ -0,0 +1,9 @@
+"""All Mac-related plugins"""
+
+import os
+
+from volatility.framework import constants
+
+# This is necessary to ensure the core plugins are available, whilst still be overridable
+plugin_path_components = __name__.split('.')[2:]
+__path__ = [os.path.join(x, *plugin_path_components) for x in constants.PLUGINS_PATH]