diff --git a/Avalonia.sln b/Avalonia.sln
index b4decb7dcc..b919623c9e 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -303,9 +303,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Win32.Automation",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XEmbedSample", "samples\XEmbedSample\XEmbedSample.csproj", "{255614F5-CB64-4ECA-A026-E0B1AF6A2EF4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.MacCatalyst", "samples\ControlCatalog.iOS\ControlCatalog.MacCatalyst.csproj", "{DE3C28DD-B602-4750-831D-345102A54CA0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.MacCatalyst", "samples\ControlCatalog.MacCatalyst\ControlCatalog.MacCatalyst.csproj", "{DE3C28DD-B602-4750-831D-345102A54CA0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.tvOS", "samples\ControlCatalog.iOS\ControlCatalog.tvOS.csproj", "{14342787-B4EF-4076-8C91-BA6C523DE8DF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.tvOS", "samples\ControlCatalog.tvOS\ControlCatalog.tvOS.csproj", "{14342787-B4EF-4076-8C91-BA6C523DE8DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/dirs.proj b/dirs.proj
index 28a91c8b68..3f5e8a3f25 100644
--- a/dirs.proj
+++ b/dirs.proj
@@ -9,6 +9,8 @@
     <ProjectReference Remove="**/*.shproj" />
     <!-- Exclude iOS, Android and Browser samples from build -->
     <ProjectReference Remove="samples/*.iOS/*.csproj" />
+    <ProjectReference Remove="samples/*.tvOS/*.csproj" />
+    <ProjectReference Remove="samples/*.MacCatalyst/*.csproj" />
     <ProjectReference Remove="samples/*.Android/*.csproj" />
     <ProjectReference Remove="samples/*.Browser/*.csproj" />
     <ProjectReference Remove="samples/*.Blazor/*.csproj" />
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.MacCatalyst.csproj b/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
similarity index 63%
rename from samples/ControlCatalog.iOS/ControlCatalog.MacCatalyst.csproj
rename to samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
index f7cd8eebf4..0a1329e2e3 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.MacCatalyst.csproj
+++ b/samples/ControlCatalog.MacCatalyst/ControlCatalog.MacCatalyst.csproj
@@ -1,19 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ProvisioningType>manual</ProvisioningType>
     <TargetFramework>$(AvsCurrentMacCatalystTargetFramework)</TargetFramework>
     <!-- Used to support Desktop Mode Idiom, min supported version is 13.1, which supports iPad scaling. -->
     <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
+    <UseInterpreter>true</UseInterpreter>
   </PropertyGroup>
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    <None Include="Info.Catalyst.plist">
-      <LogicalName>Info.plist</LogicalName>
-    </None>
+    <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
+    <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <UseInterpreter>true</UseInterpreter>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="../ControlCatalog.iOS/*.cs" />
+    <InterfaceDefinition Include="../ControlCatalog.iOS/Resources/*.xib" />
+  </ItemGroup>
+  
 </Project>
diff --git a/samples/ControlCatalog.MacCatalyst/Entitlements.plist b/samples/ControlCatalog.MacCatalyst/Entitlements.plist
new file mode 100644
index 0000000000..0c67376eba
--- /dev/null
+++ b/samples/ControlCatalog.MacCatalyst/Entitlements.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/samples/ControlCatalog.iOS/Info.Catalyst.plist b/samples/ControlCatalog.MacCatalyst/Info.plist
similarity index 96%
rename from samples/ControlCatalog.iOS/Info.Catalyst.plist
rename to samples/ControlCatalog.MacCatalyst/Info.plist
index ad5aecb10a..1a21cbbfed 100644
--- a/samples/ControlCatalog.iOS/Info.Catalyst.plist
+++ b/samples/ControlCatalog.MacCatalyst/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDisplayName</key>
-	<string>ControlCatalog.Catalyst</string>
+	<string>ControlCatalog.MacCatalyst</string>
 	<key>CFBundleIdentifier</key>
 	<string>Avalonia.ControlCatalog</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index 1ab3df1b63..bab1dd4c9f 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -1,18 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ProvisioningType>manual</ProvisioningType>
     <TargetFramework>$(AvsCurrentIOSTargetFramework)</TargetFramework>
     <SupportedOSPlatformVersion>$(AvsMinSupportedIOSVersion)</SupportedOSPlatformVersion>
   </PropertyGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    <None Include="Info.iOS.plist">
-      <LogicalName>Info.plist</LogicalName>
-    </None>
+    <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
+    <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <UseInterpreter>true</UseInterpreter>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/samples/ControlCatalog.iOS/Info.iOS.plist b/samples/ControlCatalog.iOS/Info.plist
similarity index 100%
rename from samples/ControlCatalog.iOS/Info.iOS.plist
rename to samples/ControlCatalog.iOS/Info.plist
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.tvOS.csproj b/samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj
similarity index 70%
rename from samples/ControlCatalog.iOS/ControlCatalog.tvOS.csproj
rename to samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj
index 35e964abab..5e191a59dd 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.tvOS.csproj
+++ b/samples/ControlCatalog.tvOS/ControlCatalog.tvOS.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ProvisioningType>manual</ProvisioningType>
@@ -7,15 +8,17 @@
     <!-- To run this in the simulator, you need to use the x64 architecture, 
      since SkiaSharp only bundles native libraries for x64 for the tvOS Simulator  -->
     <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">tvossimulator-x64</RuntimeIdentifier>
+    <UseInterpreter>true</UseInterpreter>
   </PropertyGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
-    <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
-    <None Include="Info.tvOS.plist">
-      <LogicalName>Info.plist</LogicalName>
-    </None>
+    <ProjectReference Include="../../src/iOS/Avalonia.iOS/Avalonia.iOS.csproj" />
+    <ProjectReference Include="../ControlCatalog/ControlCatalog.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <UseInterpreter>true</UseInterpreter>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="../ControlCatalog.iOS/*.cs" />
+    <InterfaceDefinition Include="../ControlCatalog.iOS/Resources/*.xib" />
+  </ItemGroup>
+
 </Project>
diff --git a/samples/ControlCatalog.tvOS/Entitlements.plist b/samples/ControlCatalog.tvOS/Entitlements.plist
new file mode 100644
index 0000000000..0c67376eba
--- /dev/null
+++ b/samples/ControlCatalog.tvOS/Entitlements.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/samples/ControlCatalog.iOS/Info.tvOS.plist b/samples/ControlCatalog.tvOS/Info.plist
similarity index 100%
rename from samples/ControlCatalog.iOS/Info.tvOS.plist
rename to samples/ControlCatalog.tvOS/Info.plist