diff --git a/extras/AudioPluginHost/AudioPluginHost.jucer b/extras/AudioPluginHost/AudioPluginHost.jucer
index 83671e0d75..2c3c8baca9 100644
--- a/extras/AudioPluginHost/AudioPluginHost.jucer
+++ b/extras/AudioPluginHost/AudioPluginHost.jucer
@@ -179,17 +179,17 @@
   </EXPORTFORMATS>
   <MAINGROUP id="YdWL7hi7p" name="AudioPluginHost">
     <GROUP id="{CFED5B3D-D1D8-0F3F-4D67-B2A810D057EF}" name="Source">
-      <GROUP id="{AE20356E-1F78-F99D-7D44-08529665AEDA}" name="Filters">
-        <FILE id="CogQ5Q" name="FilterGraph.cpp" compile="1" resource="0" file="Source/Filters/FilterGraph.cpp"/>
-        <FILE id="pfZWFw" name="FilterGraph.h" compile="0" resource="0" file="Source/Filters/FilterGraph.h"/>
-        <FILE id="BltUzI" name="FilterIOConfiguration.cpp" compile="1" resource="0"
-              file="Source/Filters/FilterIOConfiguration.cpp"/>
-        <FILE id="r9SuL8" name="FilterIOConfiguration.h" compile="0" resource="0"
-              file="Source/Filters/FilterIOConfiguration.h"/>
-        <FILE id="UcOOog" name="InternalFilters.cpp" compile="1" resource="0"
-              file="Source/Filters/InternalFilters.cpp"/>
-        <FILE id="Bll6sn" name="InternalFilters.h" compile="0" resource="0"
-              file="Source/Filters/InternalFilters.h"/>
+      <GROUP id="{6F257CD6-CE86-9BBC-54C1-45E43249E414}" name="Plugins">
+        <FILE id="pov6wS" name="InternalPlugins.cpp" compile="1" resource="0"
+              file="Source/Plugins/InternalPlugins.cpp"/>
+        <FILE id="MV6AI1" name="InternalPlugins.h" compile="0" resource="0"
+              file="Source/Plugins/InternalPlugins.h"/>
+        <FILE id="wwL4tB" name="IOConfigurationWindow.cpp" compile="1" resource="0"
+              file="Source/Plugins/IOConfigurationWindow.cpp"/>
+        <FILE id="wxvaJK" name="IOConfigurationWindow.h" compile="0" resource="0"
+              file="Source/Plugins/IOConfigurationWindow.h"/>
+        <FILE id="kmUcW8" name="PluginGraph.cpp" compile="1" resource="0" file="Source/Plugins/PluginGraph.cpp"/>
+        <FILE id="cbvjhb" name="PluginGraph.h" compile="0" resource="0" file="Source/Plugins/PluginGraph.h"/>
       </GROUP>
       <GROUP id="{D892BFB2-FE85-B70F-10D3-450F407E2B3D}" name="UI">
         <FILE id="wPgLS9" name="GraphEditorPanel.cpp" compile="1" resource="0"
diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
index 57b0caa11a..5d756607cd 100644
--- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
+++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
@@ -36,12 +36,12 @@ add_library( ${BINARY_NAME}
 
     SHARED
 
-    "../../../Source/Filters/FilterGraph.cpp"
-    "../../../Source/Filters/FilterGraph.h"
-    "../../../Source/Filters/FilterIOConfiguration.cpp"
-    "../../../Source/Filters/FilterIOConfiguration.h"
-    "../../../Source/Filters/InternalFilters.cpp"
-    "../../../Source/Filters/InternalFilters.h"
+    "../../../Source/Plugins/InternalPlugins.cpp"
+    "../../../Source/Plugins/InternalPlugins.h"
+    "../../../Source/Plugins/IOConfigurationWindow.cpp"
+    "../../../Source/Plugins/IOConfigurationWindow.h"
+    "../../../Source/Plugins/PluginGraph.cpp"
+    "../../../Source/Plugins/PluginGraph.h"
     "../../../Source/UI/GraphEditorPanel.cpp"
     "../../../Source/UI/GraphEditorPanel.h"
     "../../../Source/UI/MainHostWindow.cpp"
@@ -1401,9 +1401,9 @@ add_library( ${BINARY_NAME}
     "../../../JuceLibraryCode/JuceHeader.h"
 )
 
-set_source_files_properties("../../../Source/Filters/FilterGraph.h" PROPERTIES HEADER_FILE_ONLY TRUE)
-set_source_files_properties("../../../Source/Filters/FilterIOConfiguration.h" PROPERTIES HEADER_FILE_ONLY TRUE)
-set_source_files_properties("../../../Source/Filters/InternalFilters.h" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../Source/Plugins/InternalPlugins.h" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../Source/Plugins/IOConfigurationWindow.h" PROPERTIES HEADER_FILE_ONLY TRUE)
+set_source_files_properties("../../../Source/Plugins/PluginGraph.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../Source/UI/GraphEditorPanel.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../Source/UI/MainHostWindow.h" PROPERTIES HEADER_FILE_ONLY TRUE)
 set_source_files_properties("../../../Source/UI/PluginWindow.h" PROPERTIES HEADER_FILE_ONLY TRUE)
diff --git a/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile b/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile
index c01418bed9..e6bb5df34d 100644
--- a/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile
+++ b/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile
@@ -68,9 +68,9 @@ ifeq ($(CONFIG),Release)
 endif
 
 OBJECTS_APP := \
-  $(JUCE_OBJDIR)/FilterGraph_769715e3.o \
-  $(JUCE_OBJDIR)/FilterIOConfiguration_d1cf3d25.o \
-  $(JUCE_OBJDIR)/InternalFilters_eceadbab.o \
+  $(JUCE_OBJDIR)/InternalPlugins_8278e3f5.o \
+  $(JUCE_OBJDIR)/IOConfigurationWindow_d71a5732.o \
+  $(JUCE_OBJDIR)/PluginGraph_6bd15e2d.o \
   $(JUCE_OBJDIR)/GraphEditorPanel_2223d925.o \
   $(JUCE_OBJDIR)/MainHostWindow_b3494acd.o \
   $(JUCE_OBJDIR)/HostStartup_5ce96f96.o \
@@ -103,19 +103,19 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES)
 	-$(V_AT)mkdir -p $(JUCE_OUTDIR)
 	$(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH)
 
-$(JUCE_OBJDIR)/FilterGraph_769715e3.o: ../../Source/Filters/FilterGraph.cpp
+$(JUCE_OBJDIR)/InternalPlugins_8278e3f5.o: ../../Source/Plugins/InternalPlugins.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling FilterGraph.cpp"
+	@echo "Compiling InternalPlugins.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/FilterIOConfiguration_d1cf3d25.o: ../../Source/Filters/FilterIOConfiguration.cpp
+$(JUCE_OBJDIR)/IOConfigurationWindow_d71a5732.o: ../../Source/Plugins/IOConfigurationWindow.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling FilterIOConfiguration.cpp"
+	@echo "Compiling IOConfigurationWindow.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
-$(JUCE_OBJDIR)/InternalFilters_eceadbab.o: ../../Source/Filters/InternalFilters.cpp
+$(JUCE_OBJDIR)/PluginGraph_6bd15e2d.o: ../../Source/Plugins/PluginGraph.cpp
 	-$(V_AT)mkdir -p $(JUCE_OBJDIR)
-	@echo "Compiling InternalFilters.cpp"
+	@echo "Compiling PluginGraph.cpp"
 	$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<"
 
 $(JUCE_OBJDIR)/GraphEditorPanel_2223d925.o: ../../Source/UI/GraphEditorPanel.cpp
diff --git a/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj b/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj
index e4c77b58ec..c99c747cb5 100644
--- a/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj
+++ b/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj
@@ -81,17 +81,17 @@
 			isa = PBXBuildFile;
 			fileRef = 2A6983F82B13F9E8B10299AE;
 		};
-		2E74188531792924F0C73142 = {
+		7FF8A938915488310A7F5921 = {
 			isa = PBXBuildFile;
-			fileRef = 05863BDFC582C9552A86DF49;
+			fileRef = 87A7AAB053051C49EAF4EE88;
 		};
-		C8423A9611C8AAF27468847D = {
+		025B22813EA4E34CE3630B9A = {
 			isa = PBXBuildFile;
-			fileRef = 336FD30C38BD0A176161B8AE;
+			fileRef = C37B2E77AAB6C9E13729BF99;
 		};
-		786AF545C1C1E4D11140C3DF = {
+		09309BD494A05931864B6730 = {
 			isa = PBXBuildFile;
-			fileRef = 43647951ECC7F030B9953965;
+			fileRef = 0B1CC8C80F6F99BDE7D6AEC9;
 		};
 		3E1689E23B9C85F03209DCEF = {
 			isa = PBXBuildFile;
@@ -179,11 +179,11 @@
 			path = ../../Source/UI/GraphEditorPanel.h;
 			sourceTree = "SOURCE_ROOT";
 		};
-		05863BDFC582C9552A86DF49 = {
+		0B1CC8C80F6F99BDE7D6AEC9 = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			name = FilterGraph.cpp;
-			path = ../../Source/Filters/FilterGraph.cpp;
+			name = PluginGraph.cpp;
+			path = ../../Source/Plugins/PluginGraph.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
 		1DADAD8E34AAF4AFF1C69DC4 = {
@@ -228,13 +228,6 @@
 			path = System/Library/Frameworks/CoreMedia.framework;
 			sourceTree = SDKROOT;
 		};
-		336FD30C38BD0A176161B8AE = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			name = FilterIOConfiguration.cpp;
-			path = ../../Source/Filters/FilterIOConfiguration.cpp;
-			sourceTree = "SOURCE_ROOT";
-		};
 		37E4D5C341406B7072120006 = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.objcpp;
@@ -263,11 +256,11 @@
 			path = ../../Source/UI/GraphEditorPanel.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
-		43647951ECC7F030B9953965 = {
+		46C3C2CD301CD59C51FD02D6 = {
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			name = InternalFilters.cpp;
-			path = ../../Source/Filters/InternalFilters.cpp;
+			lastKnownFileType = sourcecode.c.h;
+			name = PluginGraph.h;
+			path = ../../Source/Plugins/PluginGraph.h;
 			sourceTree = "SOURCE_ROOT";
 		};
 		4C7D82F9274A4F9DBF11235C = {
@@ -291,13 +284,6 @@
 			path = "../../../../modules/juce_audio_devices";
 			sourceTree = "SOURCE_ROOT";
 		};
-		545D57A6AA801B38548B0CAC = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = FilterGraph.h;
-			path = ../../Source/Filters/FilterGraph.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		57DF618F1DE781556B7AFC32 = {
 			isa = PBXFileReference;
 			lastKnownFileType = text.plist.xml;
@@ -375,13 +361,6 @@
 			path = ../../JuceLibraryCode/BinaryData.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
-		725D0D9C8C7FF7B3FB3020ED = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = FilterIOConfiguration.h;
-			path = ../../Source/Filters/FilterIOConfiguration.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		7DA35787B5F6F7440D667CC8 = {
 			isa = PBXFileReference;
 			lastKnownFileType = file.nib;
@@ -417,6 +396,13 @@
 			path = System/Library/Frameworks/Accelerate.framework;
 			sourceTree = SDKROOT;
 		};
+		87A7AAB053051C49EAF4EE88 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = InternalPlugins.cpp;
+			path = ../../Source/Plugins/InternalPlugins.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		89309C0C5F3269BD06BE7F27 = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -473,13 +459,6 @@
 			path = System/Library/Frameworks/Cocoa.framework;
 			sourceTree = SDKROOT;
 		};
-		9EBEE3AE5856E877478607C7 = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = InternalFilters.h;
-			path = ../../Source/Filters/InternalFilters.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		9F9B445E6755CAA19E4344ED = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -564,6 +543,20 @@
 			path = "../../JuceLibraryCode/include_juce_cryptography.mm";
 			sourceTree = "SOURCE_ROOT";
 		};
+		B95B9D6774059DBB19F2B4E2 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = InternalPlugins.h;
+			path = ../../Source/Plugins/InternalPlugins.h;
+			sourceTree = "SOURCE_ROOT";
+		};
+		C37B2E77AAB6C9E13729BF99 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = IOConfigurationWindow.cpp;
+			path = ../../Source/Plugins/IOConfigurationWindow.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		D313CF37B25D7FD313C4F336 = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -592,6 +585,13 @@
 			path = System/Library/Frameworks/CoreAudioKit.framework;
 			sourceTree = SDKROOT;
 		};
+		F14CDB17EFE157DA3C3A5A91 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = IOConfigurationWindow.h;
+			path = ../../Source/Plugins/IOConfigurationWindow.h;
+			sourceTree = "SOURCE_ROOT";
+		};
 		F299BECFB2AEA6105F014848 = {
 			isa = PBXFileReference;
 			lastKnownFileType = file;
@@ -620,17 +620,17 @@
 			path = "../../../../modules/juce_audio_processors";
 			sourceTree = "SOURCE_ROOT";
 		};
-		AA37F82D57C9BB4BE78FCCB9 = {
+		9F51E92D8C77FA9DDD1F7B10 = {
 			isa = PBXGroup;
 			children = (
-				05863BDFC582C9552A86DF49,
-				545D57A6AA801B38548B0CAC,
-				336FD30C38BD0A176161B8AE,
-				725D0D9C8C7FF7B3FB3020ED,
-				43647951ECC7F030B9953965,
-				9EBEE3AE5856E877478607C7,
+				87A7AAB053051C49EAF4EE88,
+				B95B9D6774059DBB19F2B4E2,
+				C37B2E77AAB6C9E13729BF99,
+				F14CDB17EFE157DA3C3A5A91,
+				0B1CC8C80F6F99BDE7D6AEC9,
+				46C3C2CD301CD59C51FD02D6,
 			);
-			name = Filters;
+			name = Plugins;
 			sourceTree = "<group>";
 		};
 		DE7B77306553B1204071B39A = {
@@ -648,7 +648,7 @@
 		B225B7F2CAABD28A41E7C339 = {
 			isa = PBXGroup;
 			children = (
-				AA37F82D57C9BB4BE78FCCB9,
+				9F51E92D8C77FA9DDD1F7B10,
 				DE7B77306553B1204071B39A,
 				A66EFAC64B1B67B536C73415,
 				B2A1E626CC120982805754F6,
@@ -979,9 +979,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2E74188531792924F0C73142,
-				C8423A9611C8AAF27468847D,
-				786AF545C1C1E4D11140C3DF,
+				7FF8A938915488310A7F5921,
+				025B22813EA4E34CE3630B9A,
+				09309BD494A05931864B6730,
 				3E1689E23B9C85F03209DCEF,
 				F635D974599DEC2ED91E6A88,
 				A1B0416DA378BB0C3AD6F74B,
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj
index 1f2a99cba5..461f84d72d 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj
+++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj
@@ -63,7 +63,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -105,7 +105,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -140,9 +140,9 @@
     <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp"/>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp"/>
     <ClCompile Include="..\..\Source\UI\MainHostWindow.cpp"/>
     <ClCompile Include="..\..\Source\HostStartup.cpp"/>
@@ -1924,9 +1924,9 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_video.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h"/>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h"/>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h"/>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h"/>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h"/>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h"/>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h"/>
     <ClInclude Include="..\..\Source\UI\MainHostWindow.h"/>
     <ClInclude Include="..\..\Source\UI\PluginWindow.h"/>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters
index 6ef6bf1e06..f6f48cb07c 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters
+++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters
@@ -2,8 +2,8 @@
 
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="AudioPluginHost\Source\Filters">
-      <UniqueIdentifier>{01436C03-42F4-5952-30EF-7F9E81D997C6}</UniqueIdentifier>
+    <Filter Include="AudioPluginHost\Source\Plugins">
+      <UniqueIdentifier>{346E906D-8A2B-A93A-4C90-BCD3C60D2FD0}</UniqueIdentifier>
     </Filter>
     <Filter Include="AudioPluginHost\Source\UI">
       <UniqueIdentifier>{8C61EB30-11E6-7029-4CC8-56C52EB1F1C3}</UniqueIdentifier>
@@ -430,14 +430,14 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp">
       <Filter>AudioPluginHost\Source\UI</Filter>
@@ -2376,14 +2376,14 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h">
       <Filter>AudioPluginHost\Source\UI</Filter>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj
index 571ae5a5f1..2a03984008 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj
+++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj
@@ -63,7 +63,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -105,7 +105,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -140,9 +140,9 @@
     <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp"/>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp"/>
     <ClCompile Include="..\..\Source\UI\MainHostWindow.cpp"/>
     <ClCompile Include="..\..\Source\HostStartup.cpp"/>
@@ -1924,9 +1924,9 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_video.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h"/>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h"/>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h"/>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h"/>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h"/>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h"/>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h"/>
     <ClInclude Include="..\..\Source\UI\MainHostWindow.h"/>
     <ClInclude Include="..\..\Source\UI\PluginWindow.h"/>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters
index 2ca33e4a97..f741285a69 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters
+++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters
@@ -2,8 +2,8 @@
 
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="AudioPluginHost\Source\Filters">
-      <UniqueIdentifier>{01436C03-42F4-5952-30EF-7F9E81D997C6}</UniqueIdentifier>
+    <Filter Include="AudioPluginHost\Source\Plugins">
+      <UniqueIdentifier>{346E906D-8A2B-A93A-4C90-BCD3C60D2FD0}</UniqueIdentifier>
     </Filter>
     <Filter Include="AudioPluginHost\Source\UI">
       <UniqueIdentifier>{8C61EB30-11E6-7029-4CC8-56C52EB1F1C3}</UniqueIdentifier>
@@ -430,14 +430,14 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp">
       <Filter>AudioPluginHost\Source\UI</Filter>
@@ -2376,14 +2376,14 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h">
       <Filter>AudioPluginHost\Source\UI</Filter>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
index d8901e937c..d79d756f38 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
+++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj
@@ -63,7 +63,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -105,7 +105,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\SDKs\VST_SDK\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -140,9 +140,9 @@
     <Lib/>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp"/>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp"/>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp"/>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp"/>
     <ClCompile Include="..\..\Source\UI\MainHostWindow.cpp"/>
     <ClCompile Include="..\..\Source\HostStartup.cpp"/>
@@ -1924,9 +1924,9 @@
     <ClCompile Include="..\..\JuceLibraryCode\include_juce_video.cpp"/>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h"/>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h"/>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h"/>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h"/>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h"/>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h"/>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h"/>
     <ClInclude Include="..\..\Source\UI\MainHostWindow.h"/>
     <ClInclude Include="..\..\Source\UI\PluginWindow.h"/>
diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
index 12f38daedd..21548cf664 100644
--- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
+++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters
@@ -2,8 +2,8 @@
 
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="AudioPluginHost\Source\Filters">
-      <UniqueIdentifier>{01436C03-42F4-5952-30EF-7F9E81D997C6}</UniqueIdentifier>
+    <Filter Include="AudioPluginHost\Source\Plugins">
+      <UniqueIdentifier>{346E906D-8A2B-A93A-4C90-BCD3C60D2FD0}</UniqueIdentifier>
     </Filter>
     <Filter Include="AudioPluginHost\Source\UI">
       <UniqueIdentifier>{8C61EB30-11E6-7029-4CC8-56C52EB1F1C3}</UniqueIdentifier>
@@ -430,14 +430,14 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Source\Filters\FilterGraph.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\InternalPlugins.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\FilterIOConfiguration.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\IOConfigurationWindow.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Filters\InternalFilters.cpp">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClCompile Include="..\..\Source\Plugins\PluginGraph.cpp">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClCompile>
     <ClCompile Include="..\..\Source\UI\GraphEditorPanel.cpp">
       <Filter>AudioPluginHost\Source\UI</Filter>
@@ -2376,14 +2376,14 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Source\Filters\FilterGraph.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\InternalPlugins.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\FilterIOConfiguration.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\IOConfigurationWindow.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Filters\InternalFilters.h">
-      <Filter>AudioPluginHost\Source\Filters</Filter>
+    <ClInclude Include="..\..\Source\Plugins\PluginGraph.h">
+      <Filter>AudioPluginHost\Source\Plugins</Filter>
     </ClInclude>
     <ClInclude Include="..\..\Source\UI\GraphEditorPanel.h">
       <Filter>AudioPluginHost\Source\UI</Filter>
diff --git a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj
index f3bfe372a3..b754683976 100644
--- a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj
+++ b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj
@@ -85,17 +85,17 @@
 			isa = PBXBuildFile;
 			fileRef = 2A6983F82B13F9E8B10299AE;
 		};
-		2E74188531792924F0C73142 = {
+		7FF8A938915488310A7F5921 = {
 			isa = PBXBuildFile;
-			fileRef = 05863BDFC582C9552A86DF49;
+			fileRef = 87A7AAB053051C49EAF4EE88;
 		};
-		C8423A9611C8AAF27468847D = {
+		025B22813EA4E34CE3630B9A = {
 			isa = PBXBuildFile;
-			fileRef = 336FD30C38BD0A176161B8AE;
+			fileRef = C37B2E77AAB6C9E13729BF99;
 		};
-		786AF545C1C1E4D11140C3DF = {
+		09309BD494A05931864B6730 = {
 			isa = PBXBuildFile;
-			fileRef = 43647951ECC7F030B9953965;
+			fileRef = 0B1CC8C80F6F99BDE7D6AEC9;
 		};
 		3E1689E23B9C85F03209DCEF = {
 			isa = PBXBuildFile;
@@ -190,11 +190,11 @@
 			path = ../../Source/UI/GraphEditorPanel.h;
 			sourceTree = "SOURCE_ROOT";
 		};
-		05863BDFC582C9552A86DF49 = {
+		0B1CC8C80F6F99BDE7D6AEC9 = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			name = FilterGraph.cpp;
-			path = ../../Source/Filters/FilterGraph.cpp;
+			name = PluginGraph.cpp;
+			path = ../../Source/Plugins/PluginGraph.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
 		1DADAD8E34AAF4AFF1C69DC4 = {
@@ -253,13 +253,6 @@
 			path = System/Library/Frameworks/CoreMedia.framework;
 			sourceTree = SDKROOT;
 		};
-		336FD30C38BD0A176161B8AE = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			name = FilterIOConfiguration.cpp;
-			path = ../../Source/Filters/FilterIOConfiguration.cpp;
-			sourceTree = "SOURCE_ROOT";
-		};
 		37E4D5C341406B7072120006 = {
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.objcpp;
@@ -288,11 +281,11 @@
 			path = ../../Source/UI/GraphEditorPanel.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
-		43647951ECC7F030B9953965 = {
+		46C3C2CD301CD59C51FD02D6 = {
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			name = InternalFilters.cpp;
-			path = ../../Source/Filters/InternalFilters.cpp;
+			lastKnownFileType = sourcecode.c.h;
+			name = PluginGraph.h;
+			path = ../../Source/Plugins/PluginGraph.h;
 			sourceTree = "SOURCE_ROOT";
 		};
 		4C7D82F9274A4F9DBF11235C = {
@@ -309,13 +302,6 @@
 			path = "../../../../modules/juce_audio_devices";
 			sourceTree = "SOURCE_ROOT";
 		};
-		545D57A6AA801B38548B0CAC = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = FilterGraph.h;
-			path = ../../Source/Filters/FilterGraph.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		57DF618F1DE781556B7AFC32 = {
 			isa = PBXFileReference;
 			lastKnownFileType = text.plist.xml;
@@ -393,13 +379,6 @@
 			path = ../../JuceLibraryCode/BinaryData.cpp;
 			sourceTree = "SOURCE_ROOT";
 		};
-		725D0D9C8C7FF7B3FB3020ED = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = FilterIOConfiguration.h;
-			path = ../../Source/Filters/FilterIOConfiguration.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		81C1A7770E082F56FE5A90A7 = {
 			isa = PBXFileReference;
 			lastKnownFileType = file;
@@ -428,6 +407,13 @@
 			path = System/Library/Frameworks/Accelerate.framework;
 			sourceTree = SDKROOT;
 		};
+		87A7AAB053051C49EAF4EE88 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = InternalPlugins.cpp;
+			path = ../../Source/Plugins/InternalPlugins.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		89309C0C5F3269BD06BE7F27 = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -477,13 +463,6 @@
 			path = ../../Source/UI/PluginWindow.h;
 			sourceTree = "SOURCE_ROOT";
 		};
-		9EBEE3AE5856E877478607C7 = {
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			name = InternalFilters.h;
-			path = ../../Source/Filters/InternalFilters.h;
-			sourceTree = "SOURCE_ROOT";
-		};
 		9F9B445E6755CAA19E4344ED = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -554,6 +533,20 @@
 			path = "../../JuceLibraryCode/include_juce_cryptography.mm";
 			sourceTree = "SOURCE_ROOT";
 		};
+		B95B9D6774059DBB19F2B4E2 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = InternalPlugins.h;
+			path = ../../Source/Plugins/InternalPlugins.h;
+			sourceTree = "SOURCE_ROOT";
+		};
+		C37B2E77AAB6C9E13729BF99 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = IOConfigurationWindow.cpp;
+			path = ../../Source/Plugins/IOConfigurationWindow.cpp;
+			sourceTree = "SOURCE_ROOT";
+		};
 		CFFA8E9A7820C5A27B4393C9 = {
 			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
@@ -589,6 +582,13 @@
 			path = System/Library/Frameworks/CoreAudioKit.framework;
 			sourceTree = SDKROOT;
 		};
+		F14CDB17EFE157DA3C3A5A91 = {
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			name = IOConfigurationWindow.h;
+			path = ../../Source/Plugins/IOConfigurationWindow.h;
+			sourceTree = "SOURCE_ROOT";
+		};
 		F299BECFB2AEA6105F014848 = {
 			isa = PBXFileReference;
 			lastKnownFileType = file;
@@ -631,17 +631,17 @@
 			path = "../../../../modules/juce_audio_processors";
 			sourceTree = "SOURCE_ROOT";
 		};
-		AA37F82D57C9BB4BE78FCCB9 = {
+		9F51E92D8C77FA9DDD1F7B10 = {
 			isa = PBXGroup;
 			children = (
-				05863BDFC582C9552A86DF49,
-				545D57A6AA801B38548B0CAC,
-				336FD30C38BD0A176161B8AE,
-				725D0D9C8C7FF7B3FB3020ED,
-				43647951ECC7F030B9953965,
-				9EBEE3AE5856E877478607C7,
+				87A7AAB053051C49EAF4EE88,
+				B95B9D6774059DBB19F2B4E2,
+				C37B2E77AAB6C9E13729BF99,
+				F14CDB17EFE157DA3C3A5A91,
+				0B1CC8C80F6F99BDE7D6AEC9,
+				46C3C2CD301CD59C51FD02D6,
 			);
-			name = Filters;
+			name = Plugins;
 			sourceTree = "<group>";
 		};
 		DE7B77306553B1204071B39A = {
@@ -659,7 +659,7 @@
 		B225B7F2CAABD28A41E7C339 = {
 			isa = PBXGroup;
 			children = (
-				AA37F82D57C9BB4BE78FCCB9,
+				9F51E92D8C77FA9DDD1F7B10,
 				DE7B77306553B1204071B39A,
 				A66EFAC64B1B67B536C73415,
 				B2A1E626CC120982805754F6,
@@ -1002,9 +1002,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2E74188531792924F0C73142,
-				C8423A9611C8AAF27468847D,
-				786AF545C1C1E4D11140C3DF,
+				7FF8A938915488310A7F5921,
+				025B22813EA4E34CE3630B9A,
+				09309BD494A05931864B6730,
 				3E1689E23B9C85F03209DCEF,
 				F635D974599DEC2ED91E6A88,
 				A1B0416DA378BB0C3AD6F74B,
diff --git a/extras/AudioPluginHost/Source/HostStartup.cpp b/extras/AudioPluginHost/Source/HostStartup.cpp
index 63e8713b37..49d8e52e68 100644
--- a/extras/AudioPluginHost/Source/HostStartup.cpp
+++ b/extras/AudioPluginHost/Source/HostStartup.cpp
@@ -26,7 +26,7 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "UI/MainHostWindow.h"
-#include "Filters/InternalFilters.h"
+#include "Plugins/InternalPlugins.h"
 
 #if ! (JUCE_PLUGINHOST_VST || JUCE_PLUGINHOST_VST3 || JUCE_PLUGINHOST_AU)
  #error "If you're building the audio plugin host, you probably want to enable VST and/or AU support"
@@ -76,7 +76,7 @@ public:
         File fileToOpen;
 
        #if JUCE_ANDROID || JUCE_IOS
-        fileToOpen = FilterGraph::getDefaultGraphDocumentOnMobile();
+        fileToOpen = PluginGraph::getDefaultGraphDocumentOnMobile();
        #else
         for (int i = 0; i < getCommandLineParameterArray().size(); ++i)
         {
@@ -112,9 +112,9 @@ public:
     void suspended() override
     {
        #if JUCE_ANDROID || JUCE_IOS
-        if (GraphDocumentComponent* graph = mainWindow->graphHolder.get())
-            if (FilterGraph* ioGraph = graph->graph.get())
-                ioGraph->saveDocument (FilterGraph::getDefaultGraphDocumentOnMobile());
+        if (auto graph = mainWindow->graphHolder.get())
+            if (auto ioGraph = graph->graph.get())
+                ioGraph->saveDocument (PluginGraph::getDefaultGraphDocumentOnMobile());
        #endif
     }
 
diff --git a/extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.cpp b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
similarity index 89%
rename from extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.cpp
rename to extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
index f5dc0b161c..2a8ac4d089 100644
--- a/extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
@@ -26,9 +26,9 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "../UI/GraphEditorPanel.h"
-#include "InternalFilters.h"
+#include "InternalPlugins.h"
 #include "../UI/MainHostWindow.h"
-#include "FilterIOConfiguration.h"
+#include "IOConfigurationWindow.h"
 
 
 //==============================================================================
@@ -171,13 +171,13 @@ private:
 };
 
 //==============================================================================
-class FilterIOConfigurationWindow::InputOutputConfig  : public Component,
-                                                        private ComboBox::Listener,
-                                                        private Button::Listener,
-                                                        private NumberedBoxes::Listener
+class IOConfigurationWindow::InputOutputConfig  : public Component,
+                                                  private ComboBox::Listener,
+                                                  private Button::Listener,
+                                                  private NumberedBoxes::Listener
 {
 public:
-    InputOutputConfig (FilterIOConfigurationWindow& parent, bool direction)
+    InputOutputConfig (IOConfigurationWindow& parent, bool direction)
         : owner (parent),
           ioTitle ("ioLabel", direction ? "Input Configuration" : "Output Configuration"),
           ioBuses (*this, false, false),
@@ -235,12 +235,12 @@ public:
 private:
     void updateBusButtons()
     {
-        if (auto* filter = owner.getAudioProcessor())
+        if (auto* plugin = owner.getAudioProcessor())
         {
             auto& header = ioBuses.getHeader();
             header.removeAllColumns();
 
-            const int n = filter->getBusCount (isInput);
+            const int n = plugin->getBusCount (isInput);
 
             for (int i = 0; i < n; ++i)
                 header.addColumn ("", i + 1, 40);
@@ -248,8 +248,8 @@ private:
             header.addColumn ("+", NumberedBoxes::plusButtonColumnId,  20);
             header.addColumn ("-", NumberedBoxes::minusButtonColumnId, 20);
 
-            ioBuses.setCanAddColumn    (filter->canAddBus    (isInput));
-            ioBuses.setCanRemoveColumn (filter->canRemoveBus (isInput));
+            ioBuses.setCanAddColumn    (plugin->canAddBus    (isInput));
+            ioBuses.setCanRemoveColumn (plugin->canRemoveBus (isInput));
         }
 
         ioBuses.setSelected (currentBus + 1);
@@ -257,9 +257,9 @@ private:
 
     void updateBusLayout()
     {
-        if (auto* filter = owner.getAudioProcessor())
+        if (auto* plugin = owner.getAudioProcessor())
         {
-            if (auto* bus = filter->getBus (isInput, currentBus))
+            if (auto* bus = plugin->getBus (isInput, currentBus))
             {
                 name.setText (bus->getName(), NotificationType::dontSendNotification);
 
@@ -418,7 +418,7 @@ private:
     }
 
     //==============================================================================
-    FilterIOConfigurationWindow& owner;
+    IOConfigurationWindow& owner;
     Label ioTitle, name;
     Label nameLabel { "nameLabel", "Bus Name:" };
     Label layoutLabel { "layoutLabel", "Channel Layout:" };
@@ -432,7 +432,7 @@ private:
 };
 
 
-FilterIOConfigurationWindow::FilterIOConfigurationWindow (AudioProcessor& p)
+IOConfigurationWindow::IOConfigurationWindow (AudioProcessor& p)
    : AudioProcessorEditor (&p),
      title ("title", p.getName())
 {
@@ -463,7 +463,7 @@ FilterIOConfigurationWindow::FilterIOConfigurationWindow (AudioProcessor& p)
     setSize (400, (inConfig != nullptr && outConfig != nullptr ? 160 : 0) + 200);
 }
 
-FilterIOConfigurationWindow::~FilterIOConfigurationWindow()
+IOConfigurationWindow::~IOConfigurationWindow()
 {
     if (auto* graph = getGraph())
     {
@@ -483,12 +483,12 @@ FilterIOConfigurationWindow::~FilterIOConfigurationWindow()
     }
 }
 
-void FilterIOConfigurationWindow::paint (Graphics& g)
+void IOConfigurationWindow::paint (Graphics& g)
 {
      g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));
 }
 
-void FilterIOConfigurationWindow::resized()
+void IOConfigurationWindow::resized()
 {
     auto r = getLocalBounds().reduced (10);
 
@@ -502,7 +502,7 @@ void FilterIOConfigurationWindow::resized()
         outConfig->setBounds (r.removeFromTop (160));
 }
 
-void FilterIOConfigurationWindow::update()
+void IOConfigurationWindow::update()
 {
     auto nodeID = getNodeID();
 
@@ -515,7 +515,7 @@ void FilterIOConfigurationWindow::update()
             panel->updateComponents();
 }
 
-AudioProcessorGraph::NodeID FilterIOConfigurationWindow::getNodeID() const
+AudioProcessorGraph::NodeID IOConfigurationWindow::getNodeID() const
 {
     if (auto* graph = getGraph())
         for (auto* node : graph->getNodes())
@@ -525,7 +525,7 @@ AudioProcessorGraph::NodeID FilterIOConfigurationWindow::getNodeID() const
     return {};
 }
 
-MainHostWindow* FilterIOConfigurationWindow::getMainWindow() const
+MainHostWindow* IOConfigurationWindow::getMainWindow() const
 {
     auto& desktop = Desktop::getInstance();
 
@@ -536,7 +536,7 @@ MainHostWindow* FilterIOConfigurationWindow::getMainWindow() const
     return nullptr;
 }
 
-GraphDocumentComponent* FilterIOConfigurationWindow::getGraphEditor() const
+GraphDocumentComponent* IOConfigurationWindow::getGraphEditor() const
 {
     if (auto* mainWindow = getMainWindow())
         return mainWindow->graphHolder.get();
@@ -544,7 +544,7 @@ GraphDocumentComponent* FilterIOConfigurationWindow::getGraphEditor() const
     return nullptr;
 }
 
-AudioProcessorGraph* FilterIOConfigurationWindow::getGraph() const
+AudioProcessorGraph* IOConfigurationWindow::getGraph() const
 {
     if (auto* graphEditor = getGraphEditor())
         if (auto* panel = graphEditor->graph.get())
diff --git a/extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.h b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.h
similarity index 84%
rename from extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.h
rename to extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.h
index 266a3a180e..ec7123edf9 100644
--- a/extras/AudioPluginHost/Source/Filters/FilterIOConfiguration.h
+++ b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.h
@@ -31,11 +31,11 @@ class GraphDocumentComponent;
 
 
 //==============================================================================
-class FilterIOConfigurationWindow   : public  AudioProcessorEditor
+class IOConfigurationWindow   : public  AudioProcessorEditor
 {
 public:
-    FilterIOConfigurationWindow (AudioProcessor&);
-    ~FilterIOConfigurationWindow() override;
+    IOConfigurationWindow (AudioProcessor&);
+    ~IOConfigurationWindow() override;
 
     //==============================================================================
     void paint (Graphics& g) override;
@@ -56,5 +56,5 @@ private:
     AudioProcessorGraph* getGraph() const;
     AudioProcessorGraph::NodeID getNodeID() const;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterIOConfigurationWindow)
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (IOConfigurationWindow)
 };
diff --git a/extras/AudioPluginHost/Source/Filters/InternalFilters.cpp b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
similarity index 94%
rename from extras/AudioPluginHost/Source/Filters/InternalFilters.cpp
rename to extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
index 94f3777b34..ac887559ff 100644
--- a/extras/AudioPluginHost/Source/Filters/InternalFilters.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
@@ -25,8 +25,8 @@
 */
 
 #include "../JuceLibraryCode/JuceHeader.h"
-#include "InternalFilters.h"
-#include "FilterGraph.h"
+#include "InternalPlugins.h"
+#include "PluginGraph.h"
 
 //==============================================================================
 class InternalPlugin   : public AudioPluginInstance
@@ -291,10 +291,10 @@ private:
 };
 
 //==============================================================================
-class ReverbFilter    : public InternalPlugin
+class ReverbPlugin    : public InternalPlugin
 {
 public:
-    ReverbFilter (const PluginDescription& descr) :   InternalPlugin (descr)
+    ReverbPlugin (const PluginDescription& descr) :   InternalPlugin (descr)
     {}
 
     static String getIdentifier()
@@ -365,9 +365,8 @@ std::unique_ptr<AudioPluginInstance> InternalPluginFormat::createInstance (const
     if (name == audioInDesc.name)  return std::make_unique<AudioProcessorGraph::AudioGraphIOProcessor> (AudioProcessorGraph::AudioGraphIOProcessor::audioInputNode);
     if (name == midiInDesc.name)   return std::make_unique<AudioProcessorGraph::AudioGraphIOProcessor> (AudioProcessorGraph::AudioGraphIOProcessor::midiInputNode);
 
-
     if (name == SineWaveSynth::getIdentifier()) return std::make_unique<SineWaveSynth> (SineWaveSynth::getPluginDescription());
-    if (name == ReverbFilter::getIdentifier())  return std::make_unique<ReverbFilter>  (ReverbFilter::getPluginDescription());
+    if (name == ReverbPlugin::getIdentifier())  return std::make_unique<ReverbPlugin>  (ReverbPlugin::getPluginDescription());
 
     return {};
 }
@@ -382,12 +381,14 @@ void InternalPluginFormat::createPluginInstance (const PluginDescription& desc,
         callback (nullptr, NEEDS_TRANS ("Invalid internal plugin name"));
 }
 
-bool InternalPluginFormat::requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const noexcept
+bool InternalPluginFormat::requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const
 {
     return false;
 }
 
 void InternalPluginFormat::getAllTypes (Array<PluginDescription>& results)
 {
-    results.add (audioInDesc, audioOutDesc, midiInDesc, SineWaveSynth::getPluginDescription(), ReverbFilter::getPluginDescription());
+    results.add (audioInDesc, audioOutDesc, midiInDesc,
+                 SineWaveSynth::getPluginDescription(),
+                 ReverbPlugin::getPluginDescription());
 }
diff --git a/extras/AudioPluginHost/Source/Filters/InternalFilters.h b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.h
similarity index 89%
rename from extras/AudioPluginHost/Source/Filters/InternalFilters.h
rename to extras/AudioPluginHost/Source/Plugins/InternalPlugins.h
index 7c1a7583f7..82baf6e77b 100644
--- a/extras/AudioPluginHost/Source/Filters/InternalFilters.h
+++ b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "FilterGraph.h"
+#include "PluginGraph.h"
 
 
 //==============================================================================
@@ -49,7 +49,8 @@ public:
     bool fileMightContainThisPluginType (const String&) override                        { return true; }
     FileSearchPath getDefaultLocationsToSearch() override                               { return {}; }
     bool canScanForPlugins() const override                                             { return false; }
-    void findAllTypesForFile (OwnedArray <PluginDescription>&, const String&) override  {}
+    bool isTrivialToScan() const override                                               { return true; }
+    void findAllTypesForFile (OwnedArray<PluginDescription>&, const String&) override   {}
     bool doesPluginStillExist (const PluginDescription&) override                       { return true; }
     String getNameOfPluginFromIdentifier (const String& fileOrIdentifier) override      { return fileOrIdentifier; }
     bool pluginNeedsRescanning (const PluginDescription&) override                      { return false; }
@@ -63,5 +64,5 @@ private:
 
     std::unique_ptr<AudioPluginInstance> createInstance (const String& name);
 
-    bool requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const noexcept override;
+    bool requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const override;
 };
diff --git a/extras/AudioPluginHost/Source/Filters/FilterGraph.cpp b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
similarity index 88%
rename from extras/AudioPluginHost/Source/Filters/FilterGraph.cpp
rename to extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
index 735449d9d0..0eeb43cdd5 100644
--- a/extras/AudioPluginHost/Source/Filters/FilterGraph.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
@@ -26,37 +26,37 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "../UI/MainHostWindow.h"
-#include "FilterGraph.h"
-#include "InternalFilters.h"
+#include "PluginGraph.h"
+#include "InternalPlugins.h"
 #include "../UI/GraphEditorPanel.h"
 
 
 //==============================================================================
-FilterGraph::FilterGraph (AudioPluginFormatManager& fm)
+PluginGraph::PluginGraph (AudioPluginFormatManager& fm)
     : FileBasedDocument (getFilenameSuffix(),
                          getFilenameWildcard(),
-                         "Load a filter graph",
-                         "Save a filter graph"),
+                         "Load a graph",
+                         "Save a graph"),
       formatManager (fm)
 {
     newDocument();
     graph.addListener (this);
 }
 
-FilterGraph::~FilterGraph()
+PluginGraph::~PluginGraph()
 {
     graph.removeListener (this);
     graph.removeChangeListener (this);
     graph.clear();
 }
 
-FilterGraph::NodeID FilterGraph::getNextUID() noexcept
+PluginGraph::NodeID PluginGraph::getNextUID() noexcept
 {
-    return FilterGraph::NodeID (++(lastUID.uid));
+    return PluginGraph::NodeID (++(lastUID.uid));
 }
 
 //==============================================================================
-void FilterGraph::changeListenerCallback (ChangeBroadcaster*)
+void PluginGraph::changeListenerCallback (ChangeBroadcaster*)
 {
     changed();
 
@@ -65,7 +65,7 @@ void FilterGraph::changeListenerCallback (ChangeBroadcaster*)
             activePluginWindows.remove (i);
 }
 
-AudioProcessorGraph::Node::Ptr FilterGraph::getNodeForName (const String& name) const
+AudioProcessorGraph::Node::Ptr PluginGraph::getNodeForName (const String& name) const
 {
     for (auto* node : graph.getNodes())
         if (auto p = node->getProcessor())
@@ -75,7 +75,7 @@ AudioProcessorGraph::Node::Ptr FilterGraph::getNodeForName (const String& name)
     return nullptr;
 }
 
-void FilterGraph::addPlugin (const PluginDescription& desc, Point<double> pos)
+void PluginGraph::addPlugin (const PluginDescription& desc, Point<double> pos)
 {
     formatManager.createPluginInstanceAsync (desc,
                                              graph.getSampleRate(),
@@ -86,13 +86,13 @@ void FilterGraph::addPlugin (const PluginDescription& desc, Point<double> pos)
                                              });
 }
 
-void FilterGraph::addPluginCallback (std::unique_ptr<AudioPluginInstance> instance,
+void PluginGraph::addPluginCallback (std::unique_ptr<AudioPluginInstance> instance,
                                      const String& error, Point<double> pos)
 {
     if (instance == nullptr)
     {
         AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon,
-                                          TRANS("Couldn't create filter"),
+                                          TRANS("Couldn't create plugin"),
                                           error);
     }
     else
@@ -108,7 +108,7 @@ void FilterGraph::addPluginCallback (std::unique_ptr<AudioPluginInstance> instan
     }
 }
 
-void FilterGraph::setNodePosition (NodeID nodeID, Point<double> pos)
+void PluginGraph::setNodePosition (NodeID nodeID, Point<double> pos)
 {
     if (auto* n = graph.getNodeForId (nodeID))
     {
@@ -117,7 +117,7 @@ void FilterGraph::setNodePosition (NodeID nodeID, Point<double> pos)
     }
 }
 
-Point<double> FilterGraph::getNodePosition (NodeID nodeID) const
+Point<double> PluginGraph::getNodePosition (NodeID nodeID) const
 {
     if (auto* n = graph.getNodeForId (nodeID))
         return { static_cast<double> (n->properties ["x"]),
@@ -127,14 +127,14 @@ Point<double> FilterGraph::getNodePosition (NodeID nodeID) const
 }
 
 //==============================================================================
-void FilterGraph::clear()
+void PluginGraph::clear()
 {
     closeAnyOpenPluginWindows();
     graph.clear();
     changed();
 }
 
-PluginWindow* FilterGraph::getOrCreateWindowFor (AudioProcessorGraph::Node* node, PluginWindow::Type type)
+PluginWindow* PluginGraph::getOrCreateWindowFor (AudioProcessorGraph::Node* node, PluginWindow::Type type)
 {
     jassert (node != nullptr);
 
@@ -174,7 +174,7 @@ PluginWindow* FilterGraph::getOrCreateWindowFor (AudioProcessorGraph::Node* node
     return nullptr;
 }
 
-bool FilterGraph::closeAnyOpenPluginWindows()
+bool PluginGraph::closeAnyOpenPluginWindows()
 {
     bool wasEmpty = activePluginWindows.isEmpty();
     activePluginWindows.clear();
@@ -182,7 +182,7 @@ bool FilterGraph::closeAnyOpenPluginWindows()
 }
 
 //==============================================================================
-String FilterGraph::getDocumentTitle()
+String PluginGraph::getDocumentTitle()
 {
     if (! getFile().exists())
         return "Unnamed";
@@ -190,7 +190,7 @@ String FilterGraph::getDocumentTitle()
     return getFile().getFileNameWithoutExtension();
 }
 
-void FilterGraph::newDocument()
+void PluginGraph::newDocument()
 {
     clear();
     setFile ({});
@@ -209,7 +209,7 @@ void FilterGraph::newDocument()
     } );
 }
 
-Result FilterGraph::loadDocument (const File& file)
+Result PluginGraph::loadDocument (const File& file)
 {
     if (auto xml = parseXMLIfTagMatches (file, "FILTERGRAPH"))
     {
@@ -225,10 +225,10 @@ Result FilterGraph::loadDocument (const File& file)
         return Result::ok();
     }
 
-    return Result::fail ("Not a valid filter graph file");
+    return Result::fail ("Not a valid graph file");
 }
 
-Result FilterGraph::saveDocument (const File& file)
+Result PluginGraph::saveDocument (const File& file)
 {
     auto xml = createXml();
 
@@ -238,7 +238,7 @@ Result FilterGraph::saveDocument (const File& file)
     return Result::ok();
 }
 
-File FilterGraph::getLastDocumentOpened()
+File PluginGraph::getLastDocumentOpened()
 {
     RecentlyOpenedFilesList recentFiles;
     recentFiles.restoreFromString (getAppProperties().getUserSettings()
@@ -247,7 +247,7 @@ File FilterGraph::getLastDocumentOpened()
     return recentFiles.getFile (0);
 }
 
-void FilterGraph::setLastDocumentOpened (const File& file)
+void PluginGraph::setLastDocumentOpened (const File& file)
 {
     RecentlyOpenedFilesList recentFiles;
     recentFiles.restoreFromString (getAppProperties().getUserSettings()
@@ -366,7 +366,7 @@ static XmlElement* createNodeXml (AudioProcessorGraph::Node* const node) noexcep
     return nullptr;
 }
 
-void FilterGraph::createNodeFromXml (const XmlElement& xml)
+void PluginGraph::createNodeFromXml (const XmlElement& xml)
 {
     PluginDescription pd;
 
@@ -427,7 +427,7 @@ void FilterGraph::createNodeFromXml (const XmlElement& xml)
     }
 }
 
-std::unique_ptr<XmlElement> FilterGraph::createXml() const
+std::unique_ptr<XmlElement> PluginGraph::createXml() const
 {
     auto xml = std::make_unique<XmlElement> ("FILTERGRAPH");
 
@@ -447,7 +447,7 @@ std::unique_ptr<XmlElement> FilterGraph::createXml() const
     return xml;
 }
 
-void FilterGraph::restoreFromXml (const XmlElement& xml)
+void PluginGraph::restoreFromXml (const XmlElement& xml)
 {
     clear();
 
@@ -466,7 +466,7 @@ void FilterGraph::restoreFromXml (const XmlElement& xml)
     graph.removeIllegalConnections();
 }
 
-File FilterGraph::getDefaultGraphDocumentOnMobile()
+File PluginGraph::getDefaultGraphDocumentOnMobile()
 {
     auto persistantStorageLocation = File::getSpecialLocation (File::userApplicationDataDirectory);
     return persistantStorageLocation.getChildFile ("state.filtergraph");
diff --git a/extras/AudioPluginHost/Source/Filters/FilterGraph.h b/extras/AudioPluginHost/Source/Plugins/PluginGraph.h
similarity index 90%
rename from extras/AudioPluginHost/Source/Filters/FilterGraph.h
rename to extras/AudioPluginHost/Source/Plugins/PluginGraph.h
index 269f4b2ce1..757647521a 100644
--- a/extras/AudioPluginHost/Source/Filters/FilterGraph.h
+++ b/extras/AudioPluginHost/Source/Plugins/PluginGraph.h
@@ -31,16 +31,16 @@
 
 //==============================================================================
 /**
-    A collection of filters and some connections between them.
+    A collection of plugins and some connections between them.
 */
-class FilterGraph   : public FileBasedDocument,
+class PluginGraph   : public FileBasedDocument,
                       public AudioProcessorListener,
                       private ChangeListener
 {
 public:
     //==============================================================================
-    FilterGraph (AudioPluginFormatManager&);
-    ~FilterGraph() override;
+    PluginGraph (AudioPluginFormatManager&);
+    ~PluginGraph() override;
 
     //==============================================================================
     using NodeID = AudioProcessorGraph::NodeID;
@@ -95,5 +95,5 @@ private:
     void addPluginCallback (std::unique_ptr<AudioPluginInstance>, const String& error, Point<double>);
     void changeListenerCallback (ChangeBroadcaster*) override;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterGraph)
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginGraph)
 };
diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
index 737acd18f8..bea2b67bb6 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
@@ -26,7 +26,7 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "GraphEditorPanel.h"
-#include "../Filters/InternalFilters.h"
+#include "../Plugins/InternalPlugins.h"
 #include "MainHostWindow.h"
 
 //==============================================================================
@@ -164,7 +164,7 @@ struct GraphEditorPanel::PinComponent   : public Component,
     }
 
     GraphEditorPanel& panel;
-    FilterGraph& graph;
+    PluginGraph& graph;
     AudioProcessorGraph::NodeAndChannel pin;
     const bool isInput;
     int busIdx = 0;
@@ -173,11 +173,11 @@ struct GraphEditorPanel::PinComponent   : public Component,
 };
 
 //==============================================================================
-struct GraphEditorPanel::FilterComponent   : public Component,
+struct GraphEditorPanel::PluginComponent   : public Component,
                                              public Timer,
                                              private AudioProcessorParameter::Listener
 {
-    FilterComponent (GraphEditorPanel& p, AudioProcessorGraph::NodeID id)  : panel (p), graph (p.graph), pluginID (id)
+    PluginComponent (GraphEditorPanel& p, AudioProcessorGraph::NodeID id)  : panel (p), graph (p.graph), pluginID (id)
     {
         shadow.setShadowProperties (DropShadow (Colours::black.withAlpha (0.5f), 3, { 0, 1 }));
         setComponentEffect (&shadow);
@@ -194,10 +194,10 @@ struct GraphEditorPanel::FilterComponent   : public Component,
         setSize (150, 60);
     }
 
-    FilterComponent (const FilterComponent&) = delete;
-    FilterComponent& operator= (const FilterComponent&) = delete;
+    PluginComponent (const PluginComponent&) = delete;
+    PluginComponent& operator= (const PluginComponent&) = delete;
 
-    ~FilterComponent() override
+    ~PluginComponent() override
     {
         if (auto f = graph.graph.getNodeForId (pluginID))
         {
@@ -491,7 +491,7 @@ struct GraphEditorPanel::FilterComponent   : public Component,
     void parameterGestureChanged (int, bool) override  {}
 
     GraphEditorPanel& panel;
-    FilterGraph& graph;
+    PluginGraph& graph;
     const AudioProcessorGraph::NodeID pluginID;
     OwnedArray<PinComponent> pins;
     int numInputs = 0, numOutputs = 0;
@@ -572,10 +572,10 @@ struct GraphEditorPanel::ConnectorComponent   : public Component,
         p1 = lastInputPos;
         p2 = lastOutputPos;
 
-        if (auto* src = panel.getComponentForFilter (connection.source.nodeID))
+        if (auto* src = panel.getComponentForPlugin (connection.source.nodeID))
             p1 = src->getPinPos (connection.source.channelIndex, false);
 
-        if (auto* dest = panel.getComponentForFilter (connection.destination.nodeID))
+        if (auto* dest = panel.getComponentForPlugin (connection.destination.nodeID))
             p2 = dest->getPinPos (connection.destination.channelIndex, true);
     }
 
@@ -689,7 +689,7 @@ struct GraphEditorPanel::ConnectorComponent   : public Component,
     }
 
     GraphEditorPanel& panel;
-    FilterGraph& graph;
+    PluginGraph& graph;
     AudioProcessorGraph::Connection connection { { {}, 0 }, { {}, 0 } };
     Point<float> lastInputPos, lastOutputPos;
     Path linePath, hitPath;
@@ -700,7 +700,7 @@ struct GraphEditorPanel::ConnectorComponent   : public Component,
 
 
 //==============================================================================
-GraphEditorPanel::GraphEditorPanel (FilterGraph& g)  : graph (g)
+GraphEditorPanel::GraphEditorPanel (PluginGraph& g)  : graph (g)
 {
     graph.addChangeListener (this);
     setOpaque (true);
@@ -751,7 +751,7 @@ void GraphEditorPanel::createNewPlugin (const PluginDescription& desc, Point<int
     graph.addPlugin (desc, position.toDouble() / Point<double> ((double) getWidth(), (double) getHeight()));
 }
 
-GraphEditorPanel::FilterComponent* GraphEditorPanel::getComponentForFilter (AudioProcessorGraph::NodeID nodeID) const
+GraphEditorPanel::PluginComponent* GraphEditorPanel::getComponentForPlugin (AudioProcessorGraph::NodeID nodeID) const
 {
     for (auto* fc : nodes)
        if (fc->pluginID == nodeID)
@@ -812,9 +812,9 @@ void GraphEditorPanel::updateComponents()
 
     for (auto* f : graph.graph.getNodes())
     {
-        if (getComponentForFilter (f->nodeID) == nullptr)
+        if (getComponentForPlugin (f->nodeID) == nullptr)
         {
-            auto* comp = nodes.add (new FilterComponent (*this, f->nodeID));
+            auto* comp = nodes.add (new PluginComponent (*this, f->nodeID));
             addAndMakeVisible (comp);
             comp->update();
         }
@@ -1155,7 +1155,7 @@ struct GraphDocumentComponent::PluginListBoxModel    : public ListBoxModel,
 GraphDocumentComponent::GraphDocumentComponent (AudioPluginFormatManager& fm,
                                                 AudioDeviceManager& dm,
                                                 KnownPluginList& kpl)
-    : graph (new FilterGraph (fm)),
+    : graph (new PluginGraph (fm)),
       deviceManager (dm),
       pluginList (kpl),
       graphPlayer (getAppProperties().getUserSettings()->getBoolValue ("doublePrecisionProcessing", false))
diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
index 291420ea3f..2796b75046 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h
@@ -26,20 +26,20 @@
 
 #pragma once
 
-#include "../Filters/FilterGraph.h"
+#include "../Plugins/PluginGraph.h"
 
 class MainHostWindow;
 
 //==============================================================================
 /**
-    A panel that displays and edits a FilterGraph.
+    A panel that displays and edits a PluginGraph.
 */
 class GraphEditorPanel   : public Component,
                            public ChangeListener,
                            private Timer
 {
 public:
-    GraphEditorPanel (FilterGraph& graph);
+    GraphEditorPanel (PluginGraph& graph);
     ~GraphEditorPanel() override;
 
     void createNewPlugin (const PluginDescription&, Point<int> position);
@@ -67,19 +67,19 @@ public:
     void endDraggingConnector (const MouseEvent&);
 
     //==============================================================================
-    FilterGraph& graph;
+    PluginGraph& graph;
 
 private:
-    struct FilterComponent;
+    struct PluginComponent;
     struct ConnectorComponent;
     struct PinComponent;
 
-    OwnedArray<FilterComponent> nodes;
+    OwnedArray<PluginComponent> nodes;
     OwnedArray<ConnectorComponent> connectors;
     std::unique_ptr<ConnectorComponent> draggingConnector;
     std::unique_ptr<PopupMenu> menu;
 
-    FilterComponent* getComponentForFilter (AudioProcessorGraph::NodeID) const;
+    PluginComponent* getComponentForPlugin (AudioProcessorGraph::NodeID) const;
     ConnectorComponent* getComponentForConnection (const AudioProcessorGraph::Connection&) const;
     PinComponent* findPinAt (Point<float>) const;
 
@@ -115,7 +115,7 @@ public:
     bool closeAnyOpenPluginWindows();
 
     //==============================================================================
-    std::unique_ptr<FilterGraph> graph;
+    std::unique_ptr<PluginGraph> graph;
 
     void resized() override;
     void unfocusKeyboardComponent();
diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
index 201482b9cc..28678c2c4c 100644
--- a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
+++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
@@ -26,7 +26,7 @@
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "MainHostWindow.h"
-#include "../Filters/InternalFilters.h"
+#include "../Plugins/InternalPlugins.h"
 
 
 //==============================================================================
@@ -119,8 +119,8 @@ MainHostWindow::MainHostWindow()
 
     knownPluginList.addChangeListener (this);
 
-    if (auto* filterGraph = graphHolder->graph.get())
-        filterGraph->addChangeListener (this);
+    if (auto* g = graphHolder->graph.get())
+        g->addChangeListener (this);
 
     addKeyListener (getCommandManager().getKeyMappings());
 
@@ -144,8 +144,8 @@ MainHostWindow::~MainHostWindow()
     pluginListWindow = nullptr;
     knownPluginList.removeChangeListener (this);
 
-    if (auto* filterGraph = graphHolder->graph.get())
-        filterGraph->removeChangeListener (this);
+    if (auto* g = graphHolder->graph.get())
+        g->removeChangeListener (this);
 
     getAppProperties().getUserSettings()->setValue ("mainWindowPos", getWindowStateAsString());
     clearContentComponent();
@@ -196,7 +196,7 @@ void MainHostWindow::tryToQuitApplication()
         new AsyncQuitRetrier();
     }
    #if JUCE_ANDROID || JUCE_IOS
-    else if (graphHolder == nullptr || graphHolder->graph->saveDocument (FilterGraph::getDefaultGraphDocumentOnMobile()))
+    else if (graphHolder == nullptr || graphHolder->graph->saveDocument (PluginGraph::getDefaultGraphDocumentOnMobile()))
    #else
     else if (graphHolder == nullptr || graphHolder->graph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk)
    #endif
@@ -607,11 +607,11 @@ void MainHostWindow::filesDropped (const StringArray& files, int x, int y)
     if (graphHolder != nullptr)
     {
        #if ! (JUCE_ANDROID || JUCE_IOS)
-        if (files.size() == 1 && File (files[0]).hasFileExtension (FilterGraph::getFilenameSuffix()))
+        if (files.size() == 1 && File (files[0]).hasFileExtension (PluginGraph::getFilenameSuffix()))
         {
-            if (auto* filterGraph = graphHolder->graph.get())
-                if (filterGraph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk)
-                    filterGraph->loadFrom (File (files[0]), true);
+            if (auto* g = graphHolder->graph.get())
+                if (g->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk)
+                    g->loadFrom (File (files[0]), true);
         }
         else
        #endif
diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.h b/extras/AudioPluginHost/Source/UI/MainHostWindow.h
index 5860d3ac9f..ded302bf9a 100644
--- a/extras/AudioPluginHost/Source/UI/MainHostWindow.h
+++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../Filters/FilterGraph.h"
+#include "../Plugins/PluginGraph.h"
 #include "GraphEditorPanel.h"
 
 
diff --git a/extras/AudioPluginHost/Source/UI/PluginWindow.h b/extras/AudioPluginHost/Source/UI/PluginWindow.h
index e092e1c89b..e2abee4665 100644
--- a/extras/AudioPluginHost/Source/UI/PluginWindow.h
+++ b/extras/AudioPluginHost/Source/UI/PluginWindow.h
@@ -26,20 +26,20 @@
 
 #pragma once
 
-#include "../Filters/FilterIOConfiguration.h"
+#include "../Plugins/IOConfigurationWindow.h"
 
-class FilterGraph;
+class PluginGraph;
 
 /**
     A window that shows a log of parameter change messagse sent by the plugin.
 */
-class FilterDebugWindow : public AudioProcessorEditor,
+class PluginDebugWindow : public AudioProcessorEditor,
                           public AudioProcessorParameter::Listener,
                           public ListBoxModel,
                           public AsyncUpdater
 {
 public:
-    FilterDebugWindow (AudioProcessor& proc)
+    PluginDebugWindow (AudioProcessor& proc)
         : AudioProcessorEditor (proc), audioProc (proc)
     {
         setSize (500, 200);
@@ -209,17 +209,10 @@ private:
             type = PluginWindow::Type::generic;
         }
 
-        if (type == PluginWindow::Type::generic)
-            return new GenericAudioProcessorEditor (processor);
-
-        if (type == PluginWindow::Type::programs)
-            return new ProgramAudioProcessorEditor (processor);
-
-        if (type == PluginWindow::Type::audioIO)
-            return new FilterIOConfigurationWindow (processor);
-
-        if (type == PluginWindow::Type::debug)
-            return new FilterDebugWindow (processor);
+        if (type == PluginWindow::Type::generic)  return new GenericAudioProcessorEditor (processor);
+        if (type == PluginWindow::Type::programs) return new ProgramAudioProcessorEditor (processor);
+        if (type == PluginWindow::Type::audioIO)  return new IOConfigurationWindow (processor);
+        if (type == PluginWindow::Type::debug)    return new PluginDebugWindow (processor);
 
         jassertfalse;
         return {};