diff --git a/meson.build b/meson.build
index baead088..2a1b1b09 100644
--- a/meson.build
+++ b/meson.build
@@ -77,14 +77,14 @@ vst3_plugin_sources = [
   'src/common/communication/common.cpp',
   'src/common/logging/common.cpp',
   'src/common/logging/vst3.cpp',
-  'src/common/serialization/vst3/audio-processor.cpp',
+  'src/common/serialization/vst3/plugin/audio-processor.cpp',
+  'src/common/serialization/vst3/plugin/component.cpp',
+  'src/common/serialization/vst3/plugin/plugin-base.cpp',
   'src/common/serialization/vst3/base.cpp',
-  'src/common/serialization/vst3/component.cpp',
   'src/common/serialization/vst3/event-list.cpp',
   'src/common/serialization/vst3/host-application.cpp',
   'src/common/serialization/vst3/param-value-queue.cpp',
   'src/common/serialization/vst3/parameter-changes.cpp',
-  'src/common/serialization/vst3/plugin-base.cpp',
   'src/common/serialization/vst3/plugin-proxy.cpp',
   'src/common/serialization/vst3/plugin-factory.cpp',
   'src/common/serialization/vst3/process-data.cpp',
@@ -119,14 +119,14 @@ host_sources = [
 if with_vst3
   host_sources += [
     'src/common/logging/vst3.cpp',
-    'src/common/serialization/vst3/audio-processor.cpp',
+    'src/common/serialization/vst3/plugin/audio-processor.cpp',
+    'src/common/serialization/vst3/plugin/component.cpp',
+    'src/common/serialization/vst3/plugin/plugin-base.cpp',
     'src/common/serialization/vst3/base.cpp',
-    'src/common/serialization/vst3/component.cpp',
     'src/common/serialization/vst3/event-list.cpp',
     'src/common/serialization/vst3/host-application.cpp',
     'src/common/serialization/vst3/param-value-queue.cpp',
     'src/common/serialization/vst3/parameter-changes.cpp',
-    'src/common/serialization/vst3/plugin-base.cpp',
     'src/common/serialization/vst3/plugin-proxy.cpp',
     'src/common/serialization/vst3/plugin-factory.cpp',
     'src/common/serialization/vst3/process-data.cpp',
diff --git a/src/common/serialization/vst3/plugin-proxy.h b/src/common/serialization/vst3/plugin-proxy.h
index c6bf9fc2..2b0730f8 100644
--- a/src/common/serialization/vst3/plugin-proxy.h
+++ b/src/common/serialization/vst3/plugin-proxy.h
@@ -20,11 +20,11 @@
 #include <pluginterfaces/vst/ivstcomponent.h>
 
 #include "../common.h"
-#include "audio-processor.h"
 #include "base.h"
-#include "component.h"
 #include "host-application.h"
-#include "plugin-base.h"
+#include "plugin/audio-processor.h"
+#include "plugin/component.h"
+#include "plugin/plugin-base.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
diff --git a/src/common/serialization/vst3/audio-processor.cpp b/src/common/serialization/vst3/plugin/audio-processor.cpp
similarity index 100%
rename from src/common/serialization/vst3/audio-processor.cpp
rename to src/common/serialization/vst3/plugin/audio-processor.cpp
diff --git a/src/common/serialization/vst3/audio-processor.h b/src/common/serialization/vst3/plugin/audio-processor.h
similarity index 98%
rename from src/common/serialization/vst3/audio-processor.h
rename to src/common/serialization/vst3/plugin/audio-processor.h
index eaffb9ad..88deb6d7 100644
--- a/src/common/serialization/vst3/audio-processor.h
+++ b/src/common/serialization/vst3/plugin/audio-processor.h
@@ -19,10 +19,10 @@
 #include <bitsery/ext/std_optional.h>
 #include <pluginterfaces/vst/ivstaudioprocessor.h>
 
-#include "../common.h"
-#include "base.h"
-#include "host-application.h"
-#include "process-data.h"
+#include "../../common.h"
+#include "../base.h"
+#include "../host-application.h"
+#include "../process-data.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
diff --git a/src/common/serialization/vst3/component.cpp b/src/common/serialization/vst3/plugin/component.cpp
similarity index 100%
rename from src/common/serialization/vst3/component.cpp
rename to src/common/serialization/vst3/plugin/component.cpp
diff --git a/src/common/serialization/vst3/component.h b/src/common/serialization/vst3/plugin/component.h
similarity index 99%
rename from src/common/serialization/vst3/component.h
rename to src/common/serialization/vst3/plugin/component.h
index 85dfaa75..8700e81f 100644
--- a/src/common/serialization/vst3/component.h
+++ b/src/common/serialization/vst3/plugin/component.h
@@ -20,9 +20,9 @@
 #include <bitsery/traits/array.h>
 #include <pluginterfaces/vst/ivstcomponent.h>
 
-#include "../../bitsery/ext/vst3.h"
-#include "../common.h"
-#include "base.h"
+#include "../../../bitsery/ext/vst3.h"
+#include "../../common.h"
+#include "../base.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
diff --git a/src/common/serialization/vst3/plugin-base.cpp b/src/common/serialization/vst3/plugin/plugin-base.cpp
similarity index 100%
rename from src/common/serialization/vst3/plugin-base.cpp
rename to src/common/serialization/vst3/plugin/plugin-base.cpp
diff --git a/src/common/serialization/vst3/plugin-base.h b/src/common/serialization/vst3/plugin/plugin-base.h
similarity index 97%
rename from src/common/serialization/vst3/plugin-base.h
rename to src/common/serialization/vst3/plugin/plugin-base.h
index fcc2389c..3ad5f118 100644
--- a/src/common/serialization/vst3/plugin-base.h
+++ b/src/common/serialization/vst3/plugin/plugin-base.h
@@ -19,9 +19,9 @@
 #include <bitsery/ext/std_optional.h>
 #include <pluginterfaces/base/ipluginbase.h>
 
-#include "../common.h"
-#include "base.h"
-#include "host-application.h"
+#include "../../common.h"
+#include "../base.h"
+#include "../host-application.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"