diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/AutoGeneratedColumns.razor b/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/AutoGeneratedColumns.razor
index 5ac5132..35325bf 100644
--- a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/AutoGeneratedColumns.razor
+++ b/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/AutoGeneratedColumns.razor
@@ -1,49 +1,12 @@
-@page "/ControlSamples/GridView/AutoGeneratedColumns"
-
-<h2>GridView Default AutoGeneratedColumns</h2>
-
-<Nav />
-
-<GridView ItemType="Customer"
-					DataKeyNames="CustomerID"
-					SelectMethod="GetCustomers"
-					AutogenerateColumns="true">
-</GridView>
-
-@code{
-	public IQueryable<Customer> GetCustomers(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
-	{
-		var customers = new List<Customer>();
-		var c1 = new Customer
-		{
-			CustomerID = 1,
-			FirstName = "John",
-			LastName = "Smith",
-			CompanyName = "Virus"
-		};
-
-		var c2 = new Customer
-		{
-			CustomerID = 2,
-			FirstName = "Jose",
-			LastName = "Rodriguez",
-			CompanyName = "Boring"
-		};
-
-
-		var c3 = new Customer
-		{
-			CustomerID = 3,
-			FirstName = "Jason",
-			LastName = "Ramirez",
-			CompanyName = "Fun Machines"
-		};
-
-		customers.Add(c1);
-		customers.Add(c2);
-		customers.Add(c3);
-
-		totalRowCount = customers.Count();
-		return customers.AsQueryable();
-	}
-}
+@page "/ControlSamples/GridView/AutoGeneratedColumns"
+
+<h2>GridView Default AutoGeneratedColumns</h2>
+
+<Nav />
+
+<GridView ItemType="Customer"
+					DataKeyNames="CustomerID"
+					SelectMethod="Customer.GetCustomers"
+					AutogenerateColumns="true">
+</GridView>
+
diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Customer.cs b/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Customer.cs
deleted file mode 100644
index 6245bd5..0000000
--- a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Customer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace AfterBlazorServerSide.Pages.ControlSamples.GridView
-{
-  public class Customer
-  {
-		public int CustomerID { get; set; }
-
-		public string FirstName { get; set; }
-
-		public string LastName { get; set; }
-
-		public string CompanyName { get; set; }
-	}
-}
diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Default.razor b/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Default.razor
index f43eb29..9e56d49 100644
--- a/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Default.razor
+++ b/samples/AfterBlazorServerSide/Pages/ControlSamples/GridView/Default.razor
@@ -1,61 +1,24 @@
-@page "/ControlSamples/GridView"
-
-<h2>GridView Default Example</h2>
-
-<Nav />
-
-<GridView  ItemType="Customer"
-					AutogenerateColumns="false"
-					DataKeyNames="CustomerID"
-					SelectMethod="GetCustomers"
-					EmptyDataText="No data available">
-	<Columns>
-		<BoundField DataField="CustomerID" HeaderText="ID" />
-		<BoundField DataField="CompanyName" HeaderText="CompanyName" />
-		<BoundField DataField="FirstName" HeaderText="FirstName"/>
-		<BoundField DataField="LastName" HeaderText="LastName"/>
-		<TemplateField>
-			<ItemTemplate Context="Item">
-				<button type="button">Click Me! @Item.FirstName</button>
-			</ItemTemplate>
-		</TemplateField>
-	</Columns>
-</GridView>
-
-@code{
-		public IQueryable<Customer> GetCustomers(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
-		{
-			var customers = new List<Customer>();
-			var c1 = new Customer
-			{
-				CustomerID = 1,
-				FirstName = "John",
-				LastName = "Smith",
-				CompanyName = "Virus"
-			};
-
-			var c2 = new Customer
-			{
-				CustomerID = 2,
-				FirstName = "Jose",
-				LastName = "Rodriguez",
-				CompanyName = "Boring"
-			};
-
-
-			var c3 = new Customer
-			{
-				CustomerID = 3,
-				FirstName = "Jason",
-				LastName = "Ramirez",
-				CompanyName = "Fun Machines"
-			};
-
-			customers.Add(c1);
-			customers.Add(c2);
-			customers.Add(c3);
-
-			totalRowCount = customers.Count();
-			return customers.AsQueryable();
-		}
-}
+@page "/ControlSamples/GridView"
+
+<h2>GridView Default Example</h2>
+
+<Nav />
+
+<GridView  ItemType="Customer"
+					AutogenerateColumns="false"
+					DataKeyNames="CustomerID"
+					SelectMethod="Customer.GetCustomers"
+					EmptyDataText="No data available">
+	<Columns>
+		<BoundField DataField="CustomerID" HeaderText="ID" />
+		<BoundField DataField="CompanyName" HeaderText="CompanyName" />
+		<BoundField DataField="FirstName" HeaderText="FirstName"/>
+		<BoundField DataField="LastName" HeaderText="LastName"/>
+		<TemplateField>
+			<ItemTemplate Context="Item">
+				<button type="button">Click Me! @Item.FirstName</button>
+			</ItemTemplate>
+		</TemplateField>
+	</Columns>
+</GridView>
+
diff --git a/samples/SharedSampleObjects/Models/Customer.cs b/samples/SharedSampleObjects/Models/Customer.cs
new file mode 100644
index 0000000..b2f76aa
--- /dev/null
+++ b/samples/SharedSampleObjects/Models/Customer.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace SharedSampleObjects.Models
+{
+  public class Customer
+  {
+		public int CustomerID { get; set; }
+
+		public string FirstName { get; set; }
+
+		public string LastName { get; set; }
+
+		public string CompanyName { get; set; }
+
+		public static IQueryable<Customer> GetCustomers(int maxRows, int startRowIndex, string sortByExpression, out int totalRowCount)
+		{
+			var customers = new List<Customer>();
+			var c1 = new Customer
+			{
+				CustomerID = 1,
+				FirstName = "John",
+				LastName = "Smith",
+				CompanyName = "Virus"
+			};
+
+			var c2 = new Customer
+			{
+				CustomerID = 2,
+				FirstName = "Jose",
+				LastName = "Rodriguez",
+				CompanyName = "Boring"
+			};
+
+
+			var c3 = new Customer
+			{
+				CustomerID = 3,
+				FirstName = "Jason",
+				LastName = "Ramirez",
+				CompanyName = "Fun Machines"
+			};
+
+			customers.Add(c1);
+			customers.Add(c2);
+			customers.Add(c3);
+
+			totalRowCount = customers.Count();
+			return customers.AsQueryable();
+		}
+
+	}
+}