diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Associations/Executable.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Associations/Executable.uexml
deleted file mode 100644
index 64fccdec..00000000
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Associations/Executable.uexml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UniversalEditor Version="4.0">
-	<Associations>
-		<Association>
-			<!-- Associate the Executable ObjectModel with the Microsoft MZ executable DataFormats and the Executable Editor -->
-			<Filters>
-				<Filter Title="Microsoft executable">
-					<FileNameFilters>
-						<FileNameFilter>*.exe</FileNameFilter>
-						<FileNameFilter>*.com</FileNameFilter>
-						<FileNameFilter>*.dll</FileNameFilter>
-						<FileNameFilter>*.rll</FileNameFilter>
-						<FileNameFilter>*.fon</FileNameFilter>
-						<FileNameFilter>*.olb</FileNameFilter>
-						<FileNameFilter>*.tlb</FileNameFilter>
-					</FileNameFilters>
-					<MagicByteSequences>
-						<MagicByteSequence>
-							<MagicByte Type="String">MZ</MagicByte>
-						</MagicByteSequence>
-					</MagicByteSequences>
-				</Filter>
-			</Filters>
-			<ObjectModels>
-				<ObjectModel TypeName="UniversalEditor.ObjectModels.Executable.ExecutableObjectModel" />
-			</ObjectModels>
-			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Executable.Microsoft.MicrosoftExecutableDataFormat" />
-			</DataFormats>
-		</Association>
-		<Association>
-			<Filters>
-				<Filter Title="Executable and Linkable Format">
-					<FileNameFilters>
-						<FileNameFilter>*.axf</FileNameFilter>
-						<FileNameFilter>*.bin</FileNameFilter>
-						<FileNameFilter>*.elf</FileNameFilter>
-						<FileNameFilter>*.o</FileNameFilter>
-						<FileNameFilter>*.prx</FileNameFilter>
-						<FileNameFilter>*.puff</FileNameFilter>
-						<FileNameFilter>*.so</FileNameFilter>
-					</FileNameFilters>
-					<MagicByteSequences>
-						<MagicByteSequence>
-							<MagicByte Type="Hexadecimal">7F</MagicByte>
-							<MagicByte Type="String">ELF</MagicByte>
-						</MagicByteSequence>
-					</MagicByteSequences>
-				</Filter>
-			</Filters>
-			<ObjectModels>
-				<ObjectModel TypeName="UniversalEditor.ObjectModels.Executable.ExecutableObjectModel" />
-			</ObjectModels>
-			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Executable.ELF.ELFDataFormat" />
-			</DataFormats>
-		</Association>
-		<Association>
-			<Filters>
-				<Filter Title="Apple Mach-O executable">
-					<FileNameFilters>
-						<FileNameFilter>*.dylib</FileNameFilter>
-						<FileNameFilter>*.bundle</FileNameFilter>
-					</FileNameFilters>
-					<MagicByteSequences>
-						<MagicByteSequence>
-							<!-- normal endianness -->
-							<MagicByte Type="Hexadecimal">FEEDFACE</MagicByte>
-						</MagicByteSequence>
-						<MagicByteSequence>
-							<!-- reverse endianness -->
-							<MagicByte Type="Hexadecimal">CEFAEDFE</MagicByte>
-						</MagicByteSequence>
-					</MagicByteSequences>
-				</Filter>
-			</Filters>
-			<ObjectModels>
-				<ObjectModel TypeName="UniversalEditor.ObjectModels.Executable.ExecutableObjectModel" />
-			</ObjectModels>
-			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.Executable.Apple.MachO.MachODataFormat" />
-			</DataFormats>
-		</Association>
-	</Associations>
-</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/AppleMachO.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/AppleMachO.uexml
new file mode 100644
index 00000000..f30d0bd5
--- /dev/null
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/AppleMachO.uexml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UniversalEditor Version="4.0">
+	<Associations>
+		<Association>
+			<Filters>
+				<Filter Title="Apple Mach-O executable">
+					<FileNameFilters>
+						<FileNameFilter>*.dylib</FileNameFilter>
+						<FileNameFilter>*.bundle</FileNameFilter>
+					</FileNameFilters>
+					<MagicByteSequences>
+						<MagicByteSequence>
+							<!-- normal endianness -->
+							<MagicByte Type="Hexadecimal">FEEDFACE</MagicByte>
+						</MagicByteSequence>
+						<MagicByteSequence>
+							<!-- reverse endianness -->
+							<MagicByte Type="Hexadecimal">CEFAEDFE</MagicByte>
+						</MagicByteSequence>
+					</MagicByteSequences>
+				</Filter>
+			</Filters>
+			<ObjectModels>
+				<ObjectModel TypeName="UniversalEditor.ObjectModels.Executable.ExecutableObjectModel" />
+			</ObjectModels>
+			<DataFormats>
+				<DataFormat TypeName="UniversalEditor.DataFormats.Executable.Apple.MachO.MachODataFormat" />
+			</DataFormats>
+		</Association>
+	</Associations>
+</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/ELF.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/ELF.uexml
index 22ff6962..1057b5a9 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/ELF.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/ELF.uexml
@@ -5,7 +5,13 @@
 			<Filters>
 				<Filter Title="Executable and Linkable Format">
 					<FileNameFilters>
+						<FileNameFilter>*.axf</FileNameFilter>
+						<FileNameFilter>*.bin</FileNameFilter>
 						<FileNameFilter>*.elf</FileNameFilter>
+						<FileNameFilter>*.o</FileNameFilter>
+						<FileNameFilter>*.prx</FileNameFilter>
+						<FileNameFilter>*.puff</FileNameFilter>
+						<FileNameFilter>*.so</FileNameFilter>
 					</FileNameFilters>
 					<MagicByteSequences>
 						<MagicByteSequence>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/MZ.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/MZ.uexml
new file mode 100644
index 00000000..9f83d9ef
--- /dev/null
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwareDeveloper/Associations/ExecutableObjectModel/MZ.uexml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UniversalEditor Version="4.0">
+	<Associations>
+		<Association>
+			<Filters>
+				<Filter Title="Microsoft Windows executable">
+					<FileNameFilters>
+						<FileNameFilter>*.exe</FileNameFilter>
+						<FileNameFilter>*.com</FileNameFilter>
+						<FileNameFilter>*.dll</FileNameFilter>
+						<FileNameFilter>*.rll</FileNameFilter>
+						<FileNameFilter>*.fon</FileNameFilter>
+						<FileNameFilter>*.olb</FileNameFilter>
+						<FileNameFilter>*.tlb</FileNameFilter>
+						<FileNameFilter>*.mpd</FileNameFilter>
+						<FileNameFilter>*.vxd</FileNameFilter>
+					</FileNameFilters>
+					<MagicByteSequences>
+						<MagicByteSequence>
+							<MagicByte Type="String">MZ</MagicByte>
+						</MagicByteSequence>
+					</MagicByteSequences>
+				</Filter>
+			</Filters>
+			<ObjectModels>
+				<ObjectModel TypeName="UniversalEditor.ObjectModels.Executable.ExecutableObjectModel" />
+			</ObjectModels>
+			<DataFormats>
+				<DataFormat TypeName="UniversalEditor.DataFormats.Executable.Microsoft.MicrosoftExecutableDataFormat" />
+			</DataFormats>
+		</Association>
+	</Associations>
+</UniversalEditor>
\ No newline at end of file
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index 976f013c..950b48da 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -39,7 +39,7 @@
   <ItemGroup>
     <Content Include="Associations\Chunked.uexml" />
     <Content Include="Extensions\AddressBook\Associations\Contact.uexml" />
-    <Content Include="Associations\Executable.uexml" />
+    <Content Include="Extensions\SoftwareDeveloper\Associations\ExecutableObjectModel\AppleMachO.uexml" />
     <Content Include="Associations\FormattedText.uexml" />
     <Content Include="Associations\Markup.uexml" />
     <Content Include="Associations\DataLink.uexml" />
@@ -664,6 +664,9 @@
   <ItemGroup>
     <Content Include="Extensions\FileSystem\Associations\PVM.uexml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Extensions\SoftwareDeveloper\Associations\ExecutableObjectModel\MZ.uexml" />
+  </ItemGroup>
   <Target Name="Build">
     <Copy SourceFiles="@(Content)" DestinationFiles="@(Content->'$(OutputPath)%(RelativeDir)%(Filename)%(Extension)')" />
   </Target>