diff --git a/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Extensions/CRI/CRIFileSystemEditorExtensions.uexml b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Extensions/CRI/CRIFileSystemEditorExtensions.uexml
new file mode 100644
index 00000000..61aeda16
--- /dev/null
+++ b/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Extensions/CRI/CRIFileSystemEditorExtensions.uexml
@@ -0,0 +1,22 @@
+<UniversalEditor Version="5.0">
+	<Editors>
+		<Editor ID="{1B5B1E8D-442A-4AC0-8EFD-03AADFF3CAD2}" TypeName="UniversalEditor.Editors.FileSystem.FileSystemEditor">
+			<Commands>
+				<Command ID="CRI_FileSystem_Extensions_Export_Header" Title="Export _Header UTF" />
+				<Command ID="CRI_FileSystem_Extensions_Export_TOC" Title="Export _TOC UTF" />
+				<Command ID="CRI_FileSystem_Extensions_Export_ITOC" Title="Export _ITOC UTF" />
+				<Command ID="CRI_FileSystem_Extensions_Export_GTOC" Title="Export _GTOC UTF" />
+				<Command ID="CRI_FileSystem_Extensions_Export_ETOC" Title="Export _ETOC UTF" />
+				<Command ID="CRI_FileSystem_Extensions" Title="CRI Tools">
+					<Items>
+						<CommandReference CommandID="CRI_FileSystem_Extensions_Export_Header" />
+						<CommandReference CommandID="CRI_FileSystem_Extensions_Export_TOC" />
+						<CommandReference CommandID="CRI_FileSystem_Extensions_Export_ITOC" />
+						<CommandReference CommandID="CRI_FileSystem_Extensions_Export_GTOC" />
+						<CommandReference CommandID="CRI_FileSystem_Extensions_Export_ETOC" />
+					</Items>
+				</Command>
+			</Commands>
+		</Editor>
+	</Editors>
+</UniversalEditor>
diff --git a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index e412ce99..dec5c4b8 100644
--- a/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -718,6 +718,7 @@
     <Content Include="Extensions\GameDeveloper\Extensions\Ultra3D\Associations\RBX.uexml" />
     <Content Include="Extensions\GameDeveloper\Extensions\Ultra3D\Associations\TBV.uexml" />
     <Content Include="Extensions\GameDeveloper\Extensions\Webfoot\Associations\DAT.uexml" />
+    <Content Include="Extensions\GameDeveloper\Extensions\CRI\CRIFileSystemEditorExtensions.uexml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configuration\Application.upl" />
@@ -770,6 +771,7 @@
     <Folder Include="Extensions\GameDeveloper\Extensions\Ultra3D\Associations\" />
     <Folder Include="Extensions\GameDeveloper\Extensions\Webfoot\" />
     <Folder Include="Extensions\GameDeveloper\Extensions\Webfoot\Associations\" />
+    <Folder Include="Extensions\GameDeveloper\Extensions\CRI\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink.xcf" />
diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.CRI.UserInterface/FileSystemEditorExtensions.cs b/Plugins.UserInterface/UniversalEditor.Plugins.CRI.UserInterface/FileSystemEditorExtensions.cs
index f959b1a0..fe318a69 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.CRI.UserInterface/FileSystemEditorExtensions.cs
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.CRI.UserInterface/FileSystemEditorExtensions.cs
@@ -56,20 +56,6 @@ namespace UniversalEditor.Plugins.CRI.UserInterface
 			if (!(Document.DataFormat is CPKDataFormat))
 				return;
 
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions", "CRI Tools", new CommandItem[]
-			{
-				new CommandReferenceCommandItem("CRI_FileSystem_Extensions_Export_Header"),
-				new CommandReferenceCommandItem("CRI_FileSystem_Extensions_Export_TOC"),
-				new CommandReferenceCommandItem("CRI_FileSystem_Extensions_Export_ITOC"),
-				new CommandReferenceCommandItem("CRI_FileSystem_Extensions_Export_GTOC"),
-				new CommandReferenceCommandItem("CRI_FileSystem_Extensions_Export_ETOC")
-			}));
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions_Export_Header", "Export Header UTF"));
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions_Export_TOC", "Export TOC UTF"));
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions_Export_ITOC", "Export ITOC UTF"));
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions_Export_GTOC", "Export GTOC UTF"));
-			Application.Commands.Add(new Command("CRI_FileSystem_Extensions_Export_ETOC", "Export ETOC UTF"));
-
 			er.Commands["FileSystemContextMenu_Unselected"].Items.Add(new SeparatorCommandItem());
 			er.Commands["FileSystemContextMenu_Unselected"].Items.Add(new CommandReferenceCommandItem("CRI_FileSystem_Extensions"));