diff --git a/Samples/ButtonXamlSample.cs b/Samples/ButtonXamlSample.cs
new file mode 100644
index 0000000..cc82b4a
--- /dev/null
+++ b/Samples/ButtonXamlSample.cs
@@ -0,0 +1,16 @@
+using Ooui;
+using Xamarin.Forms;
+
+namespace Samples
+{
+    public class ButtonXamlSample : ISample
+    {
+        public string Title => "Xamarin.Forms Button XAML";
+
+        public Ooui.Element CreateElement ()
+        {
+            var page = new ButtonXaml.ButtonXamlPage ();
+            return page.GetOouiElement ();
+        }
+    }
+}
diff --git a/Samples/DisplayAlertSample.xaml b/Samples/DisplayAlertPage.xaml
similarity index 82%
rename from Samples/DisplayAlertSample.xaml
rename to Samples/DisplayAlertPage.xaml
index 77fa509..039fe09 100644
--- a/Samples/DisplayAlertSample.xaml
+++ b/Samples/DisplayAlertPage.xaml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Samples.DisplayAlertSample">
+             x:Class="Samples.DisplayAlertPage">
     <ContentPage.Content>
         <StackLayout>
             <Label Text="Welcome to DisplayAlert Sample!" />
diff --git a/Samples/DisplayAlertSample.xaml.cs b/Samples/DisplayAlertPage.xaml.cs
similarity index 73%
rename from Samples/DisplayAlertSample.xaml.cs
rename to Samples/DisplayAlertPage.xaml.cs
index 5c2ee1d..dd7f8e9 100644
--- a/Samples/DisplayAlertSample.xaml.cs
+++ b/Samples/DisplayAlertPage.xaml.cs
@@ -7,9 +7,9 @@ using Xamarin.Forms.Xaml;
 namespace Samples
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class DisplayAlertSample : ContentPage
+	public partial class DisplayAlertPage : ContentPage
 	{
-		public DisplayAlertSample ()
+		public DisplayAlertPage ()
 		{
 			InitializeComponent ();
 		}
@@ -19,11 +19,5 @@ namespace Samples
             var result = await DisplayAlert("Alert Message", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa.", "YES", "NO");
             await DisplayAlert("Alert Response", $"You selected value: {result}", "OK");
         }
-
-        public void Publish()
-        {
-            var sample = new XamlPageSample();
-            UI.Publish("/display-alert", sample.CreateElement(this));
-        }
-	}
+    }
 }
diff --git a/Samples/DisplayAlertSample.cs b/Samples/DisplayAlertSample.cs
new file mode 100644
index 0000000..783f0f6
--- /dev/null
+++ b/Samples/DisplayAlertSample.cs
@@ -0,0 +1,22 @@
+using System;
+using Ooui;
+using Xamarin.Forms;
+
+namespace Samples
+{
+    public class DisplayAlertSample : ISample
+    {
+        public string Title => "Xamarin.Forms DisplayAlert";
+
+        public Ooui.Element CreateElement ()
+        {
+            var page = new DisplayAlertPage ();
+            return page.GetOouiElement ();
+        }
+
+        public void Publish ()
+        {
+            UI.Publish ("/display-alert", CreateElement);
+        }
+    }
+}
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index 883c5f7..2f5ef34 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -18,8 +18,11 @@
   </ItemGroup>
 	
   <ItemGroup>
-    <Compile Update="DisplayAlertSample.xaml.cs">
-      <SubType>Code</SubType>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="ButtonXamlPage.xaml.cs">
+      <DependentUpon>*.xaml</DependentUpon>
+    </Compile>
+    <Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="DisplayAlertPage.xaml.cs">
+      <DependentUpon>*.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
 	
@@ -27,7 +30,7 @@
     <EmbeddedResource Update="ButtonXamlPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="DisplayAlertSample.xaml">
+    <EmbeddedResource Update="DisplayAlertPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/Samples/XamlPageSample.cs b/Samples/XamlPageSample.cs
deleted file mode 100644
index ae6b365..0000000
--- a/Samples/XamlPageSample.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Xamarin.Forms;
-
-namespace Samples
-{
-    public class XamlPageSample
-    {
-        public string Title => "Xamarin.Forms Button XAML";
-
-        public Ooui.Element CreateElement (Page page)
-        {
-            return page.GetOouiElement ();
-        }
-    }
-}