diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/FileSystem/Associations/AFS.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRI/AFS.uexml
similarity index 84%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/FileSystem/Associations/AFS.uexml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRI/AFS.uexml
index f6bc6198..f4204708 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/FileSystem/Associations/AFS.uexml
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRI/AFS.uexml
@@ -18,7 +18,7 @@
 				<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
 			</ObjectModels>
 			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.AFS.AFSDataFormat" />
+				<DataFormat TypeName="UniversalEditor.Plugins.CRI.DataFormats.FileSystem.AFS.AFSDataFormat" />
 			</DataFormats>
 		</Association>
 	</Associations>
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRICPK.uexml b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRI/CPK.uexml
similarity index 100%
rename from CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRICPK.uexml
rename to CSharp/Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/CRI/CPK.uexml
diff --git a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
index b9b395cc..1a362e6b 100644
--- a/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
+++ b/CSharp/Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
@@ -650,8 +650,8 @@
     <Content Include="ProjectTypes\{B37FAACC-9946-454A-B4DB-4FAB8D044316}.uexml" />
     <Content Include="Extensions\GameDeveloper\Associations\FileSystem\SlightlyMadStudiosBFF.uexml" />
     <Content Include="Extensions\GameDeveloper\Associations\FileSystem\SquareSoftLGP.uexml" />
-    <Content Include="Extensions\GameDeveloper\Associations\FileSystem\CRICPK.uexml" />
-    <Content Include="Extensions\FileSystem\Associations\AFS.uexml" />
+    <Content Include="Extensions\GameDeveloper\Associations\FileSystem\CRI\AFS.uexml" />
+    <Content Include="Extensions\GameDeveloper\Associations\FileSystem\CRI\CPK.uexml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Configuration\Application.upl" />
@@ -674,6 +674,7 @@
     <Folder Include="Editors\Executable\" />
     <Folder Include="Panels\SolutionExplorer\" />
     <Folder Include="Panels\SolutionExplorer\Languages\" />
+    <Folder Include="Extensions\GameDeveloper\Associations\FileSystem\CRI\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Extensions\SoftwareDeveloper\Templates\Project\Software Development\Arduino\Images\Blink.xcf" />
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSDataFormat.cs
similarity index 98%
rename from CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSDataFormat.cs
index b25e0e68..b7c41580 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSDataFormat.cs
@@ -23,7 +23,7 @@ using System;
 using UniversalEditor.IO;
 using UniversalEditor.ObjectModels.FileSystem;
 
-namespace UniversalEditor.DataFormats.FileSystem.AFS
+namespace UniversalEditor.Plugins.CRI.DataFormats.FileSystem.AFS
 {
 	public class AFSDataFormat : DataFormat
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSFileInfo.cs b/CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSFileInfo.cs
similarity index 93%
rename from CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSFileInfo.cs
rename to CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSFileInfo.cs
index 4a4018e2..7ec901c6 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/AFS/AFSFileInfo.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/AFS/AFSFileInfo.cs
@@ -19,7 +19,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using System;
-namespace UniversalEditor.DataFormats.FileSystem.AFS
+namespace UniversalEditor.Plugins.CRI.DataFormats.FileSystem.AFS
 {
 	public struct AFSFileInfo
 	{
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.CRI/UniversalEditor.Plugins.CRI.csproj b/CSharp/Plugins/UniversalEditor.Plugins.CRI/UniversalEditor.Plugins.CRI.csproj
index 02f4ca7b..ec55110f 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.CRI/UniversalEditor.Plugins.CRI.csproj
+++ b/CSharp/Plugins/UniversalEditor.Plugins.CRI/UniversalEditor.Plugins.CRI.csproj
@@ -37,12 +37,15 @@
     <Compile Include="DataFormats\FileSystem\CPK\CPKColumnStorageType.cs" />
     <Compile Include="DataFormats\FileSystem\CPK\CPKDataFormat.cs" />
     <Compile Include="DataFormats\FileSystem\CPK\UTF\UTFDataFormat.cs" />
+    <Compile Include="DataFormats\FileSystem\AFS\AFSDataFormat.cs" />
+    <Compile Include="DataFormats\FileSystem\AFS\AFSFileInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DataFormats\" />
     <Folder Include="DataFormats\FileSystem\" />
     <Folder Include="DataFormats\FileSystem\CPK\" />
     <Folder Include="DataFormats\FileSystem\CPK\UTF\" />
+    <Folder Include="DataFormats\FileSystem\AFS\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.Core\UniversalEditor.Core.csproj">
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
index a42950f4..5ff1d0e7 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
+++ b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
@@ -232,8 +232,6 @@
     <Compile Include="DataFormats\FileSystem\WinAce\ACEHeaderFlags.cs" />
     <Compile Include="DataFormats\FileSystem\SlightlyMadStudios\BFFDataFormat.cs" />
     <Compile Include="DataFormats\FileSystem\SlightlyMadStudios\BFFCompressionType.cs" />
-    <Compile Include="DataFormats\FileSystem\AFS\AFSDataFormat.cs" />
-    <Compile Include="DataFormats\FileSystem\AFS\AFSFileInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\UniversalEditor.Core\UniversalEditor.Core.csproj">
@@ -272,7 +270,6 @@
     <Folder Include="DataFormats\FileSystem\HA\" />
     <Folder Include="DataFormats\FileSystem\HyperArchiver\" />
     <Folder Include="DataFormats\FileSystem\SlightlyMadStudios\" />
-    <Folder Include="DataFormats\FileSystem\AFS\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.