diff --git a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/SynthesizedAudio/Vocaloid.uexml b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/SynthesizedAudio/Vocaloid.uexml
similarity index 77%
rename from Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/SynthesizedAudio/Vocaloid.uexml
rename to Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/SynthesizedAudio/Vocaloid.uexml
index f992f3a0..fb009001 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/SynthesizedAudio/Vocaloid.uexml
+++ b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/SynthesizedAudio/Vocaloid.uexml
@@ -13,7 +13,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
diff --git a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/Voicebank/Vocaloid.uexml b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/Voicebank/Vocaloid.uexml
similarity index 83%
rename from Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/Voicebank/Vocaloid.uexml
rename to Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/Voicebank/Vocaloid.uexml
index dd9bbdb3..1c5dd8f0 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/Voicebank/Vocaloid.uexml
+++ b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/Voicebank/Vocaloid.uexml
@@ -22,7 +22,7 @@
-
+
diff --git a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/VoicebankIndex/Vocaloid.uexml b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/VoicebankIndex/Vocaloid.uexml
similarity index 81%
rename from Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/VoicebankIndex/Vocaloid.uexml
rename to Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/VoicebankIndex/Vocaloid.uexml
index 9d195e85..15fcd102 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Associations/VoicebankIndex/Vocaloid.uexml
+++ b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/AudioWorkstation/Extensions/Vocaloid/Associations/VoicebankIndex/Vocaloid.uexml
@@ -19,7 +19,7 @@
-
+
diff --git a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index 8c3a33c1..8515efcd 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -76,11 +76,8 @@
-
-
-
@@ -730,6 +727,9 @@
+
+
+
@@ -785,6 +785,12 @@
+
+
+
+
+
+
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/UniversalEditor.Plugins.Multimedia.csproj b/Plugins/UniversalEditor.Plugins.Multimedia/UniversalEditor.Plugins.Multimedia.csproj
index 46c369fe..13fcf8f1 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/UniversalEditor.Plugins.Multimedia.csproj
+++ b/Plugins/UniversalEditor.Plugins.Multimedia/UniversalEditor.Plugins.Multimedia.csproj
@@ -77,10 +77,7 @@
-
-
-
@@ -257,8 +254,6 @@
-
-
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs
similarity index 98%
rename from Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs
index a0c149ef..0578f7b8 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQDataFormat.cs
@@ -20,12 +20,14 @@
// along with this program. If not, see .
using System.Collections.Generic;
+
+using UniversalEditor.Accessors;
using UniversalEditor.DataFormats.PropertyList;
using UniversalEditor.DataFormats.Multimedia.Audio.Synthesized.MIDI;
using UniversalEditor.ObjectModels.Multimedia.Audio.Synthesized;
using UniversalEditor.ObjectModels.PropertyList;
-using UniversalEditor.Accessors;
-namespace UniversalEditor.DataFormats.Multimedia.Audio.Synthesized.Vocaloid
+
+namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesized.Vocaloid
{
///
/// Provides a for manipulating synthesized audio in the MIDI-based Vocaloid VSQ format.
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs
similarity index 99%
rename from Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs
index eb499b86..8432c4be 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VSQXDataFormat.cs
@@ -21,12 +21,13 @@
using System;
using System.Collections.Generic;
+
using UniversalEditor.DataFormats.Markup.XML;
using UniversalEditor.ObjectModels.Multimedia.Audio.Synthesized;
using UniversalEditor.ObjectModels.Multimedia.Audio.Voicebank;
using UniversalEditor.ObjectModels.Markup;
-namespace UniversalEditor.DataFormats.Multimedia.Audio.Synthesized.Vocaloid
+namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesized.Vocaloid
{
///
/// Provides a for manipulating synthesized audio in the XML-based Vocaloid VSQX format.
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs
similarity index 98%
rename from Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs
index 321de5c1..3889f60f 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Voicebank/Vocaloid/VocaloidVoicebankDataFormat.cs
@@ -25,7 +25,7 @@ using UniversalEditor.ObjectModels.Multimedia.Audio.Voicebank;
using UniversalEditor.ObjectModels.FileSystem;
using UniversalEditor.Accessors;
-namespace UniversalEditor.DataFormats.Multimedia.Audio.Voicebank.Vocaloid
+namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Voicebank.Vocaloid
{
///
/// Provides a for manipulating synthesized audio voicebank data in Vocaloid DDB format.
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs
similarity index 98%
rename from Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs
rename to Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs
index f7832a6d..cf7e6c2a 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIDataFormat.cs
@@ -20,12 +20,13 @@
// along with this program. If not, see .
using System;
+
using UniversalEditor.Accessors;
using UniversalEditor.IO;
using UniversalEditor.ObjectModels.Multimedia.Audio.Voicebank;
using UniversalEditor.ObjectModels.Multimedia.Audio.VoicebankIndex;
-namespace UniversalEditor.DataFormats.Multimedia.Audio.VoicebankIndex.Vocaloid
+namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.VoicebankIndex.Vocaloid
{
///
/// Provides a for manipulating synthesized audio voicebank index in Vocaloid DDI format.
diff --git a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs
similarity index 93%
rename from Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs
rename to Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs
index eaa6c6dc..e0df9fbb 100644
--- a/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/VoicebankIndex/Vocaloid/DDIParameter.cs
@@ -21,7 +21,7 @@
using System.Text;
-namespace UniversalEditor.DataFormats.Multimedia.Audio.VoicebankIndex.Vocaloid
+namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.VoicebankIndex.Vocaloid
{
///
/// Provides information about a parameter in a DDI voicebank index file.
diff --git a/Plugins/UniversalEditor.Plugins.Vocaloid/Properties/AssemblyInfo.cs b/Plugins/UniversalEditor.Plugins.Vocaloid/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..fd93741a
--- /dev/null
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/Properties/AssemblyInfo.cs
@@ -0,0 +1,46 @@
+//
+// AssemblyInfo.cs
+//
+// Author:
+// Michael Becker
+//
+// Copyright (c) 2020 Mike Becker's Software
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("UniversalEditor.Plugins.Vocaloid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Mike Becker's Software")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("Mike Becker's Software")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
diff --git a/Plugins/UniversalEditor.Plugins.Vocaloid/UniversalEditor.Plugins.Vocaloid.csproj b/Plugins/UniversalEditor.Plugins.Vocaloid/UniversalEditor.Plugins.Vocaloid.csproj
new file mode 100644
index 00000000..e84e12ee
--- /dev/null
+++ b/Plugins/UniversalEditor.Plugins.Vocaloid/UniversalEditor.Plugins.Vocaloid.csproj
@@ -0,0 +1,66 @@
+
+
+
+ Debug
+ AnyCPU
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8}
+ Library
+ UniversalEditor.Plugins.Vocaloid
+ UniversalEditor.Plugins.Vocaloid
+ v4.7
+ 4.0.2019.12
+
+
+ true
+ full
+ false
+ ..\..\Output\Debug\Plugins
+ DEBUG;
+ prompt
+ 4
+ false
+
+
+ true
+ ..\..\Output\Release\Plugins
+ prompt
+ 4
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {2D4737E6-6D95-408A-90DB-8DFF38147E85}
+ UniversalEditor.Core
+
+
+ {30467E5C-05BC-4856-AADC-13906EF4CADD}
+ UniversalEditor.Essential
+
+
+ {BE4D0BA3-0888-42A5-9C09-FC308A4509D2}
+ UniversalEditor.Plugins.Multimedia
+
+
+
+
\ No newline at end of file
diff --git a/UniversalEditor.sln b/UniversalEditor.sln
index 03b22fa4..c6b17c3a 100644
--- a/UniversalEditor.sln
+++ b/UniversalEditor.sln
@@ -163,6 +163,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Web
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Sega", "Plugins\UniversalEditor.Plugins.Sega\UniversalEditor.Plugins.Sega.csproj", "{553DFD37-805C-4553-980A-D5696D88241A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Adobe", "Plugins\UniversalEditor.Plugins.Adobe\UniversalEditor.Plugins.Adobe.csproj", "{FD46EA8D-7711-4BAF-A486-719D754504F8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Vocaloid", "Plugins\UniversalEditor.Plugins.Vocaloid\UniversalEditor.Plugins.Vocaloid.csproj", "{C8953DB2-AE48-4F04-87EC-549E6A3E30D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -471,6 +475,14 @@ Global
{553DFD37-805C-4553-980A-D5696D88241A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{553DFD37-805C-4553-980A-D5696D88241A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{553DFD37-805C-4553-980A-D5696D88241A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FD46EA8D-7711-4BAF-A486-719D754504F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FD46EA8D-7711-4BAF-A486-719D754504F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FD46EA8D-7711-4BAF-A486-719D754504F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FD46EA8D-7711-4BAF-A486-719D754504F8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6F0AB1AF-E1A1-4D19-B19C-05BBB15C94B2} = {05D15661-E684-4EC9-8FBD-C014BA433CC5}
@@ -547,6 +559,8 @@ Global
{0E994C49-3BCF-4E13-B0B5-3FE0B8419A22} = {7B535D74-5496-4802-B809-89ED88274A91}
{6C55828C-B0BA-440F-9279-8C4CCE3B361E} = {2ED32D16-6C06-4450-909A-40D32DA67FB4}
{553DFD37-805C-4553-980A-D5696D88241A} = {2ED32D16-6C06-4450-909A-40D32DA67FB4}
+ {FD46EA8D-7711-4BAF-A486-719D754504F8} = {2ED32D16-6C06-4450-909A-40D32DA67FB4}
+ {C8953DB2-AE48-4F04-87EC-549E6A3E30D8} = {2ED32D16-6C06-4450-909A-40D32DA67FB4}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0