diff --git a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs
index 61974264..7240b8f3 100644
--- a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs
+++ b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.Designer.cs
@@ -38,7 +38,7 @@ namespace LibationWinForms.Dialogs
 			this.authorsDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.purchaseDateGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.gridEntryBindingSource = new LibationWinForms.SyncBindingSource(this.components);
+			this.gridEntryBindingSource = new LibationWinForms.GridView.SyncBindingSource(this.components);
 			this.btnRemoveBooks = new System.Windows.Forms.Button();
 			this.label1 = new System.Windows.Forms.Label();
 			((System.ComponentModel.ISupportInitialize)(this._dataGridView)).BeginInit();
@@ -176,7 +176,7 @@ namespace LibationWinForms.Dialogs
         #endregion
 
         private System.Windows.Forms.DataGridView _dataGridView;
-        private LibationWinForms.SyncBindingSource gridEntryBindingSource;
+        private LibationWinForms.GridView.SyncBindingSource gridEntryBindingSource;
         private System.Windows.Forms.Button btnRemoveBooks;
         private System.Windows.Forms.Label label1;
 		private System.Windows.Forms.DataGridViewCheckBoxColumn removeDataGridViewCheckBoxColumn;
diff --git a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs
index bb1759dc..558095f0 100644
--- a/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs
+++ b/Source/LibationWinForms/Dialogs/RemoveBooksDialog.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -121,7 +120,7 @@ namespace LibationWinForms.Dialogs
 		}
 	}
 
-	internal class RemovableGridEntry : LibraryBookEntry
+	internal class RemovableGridEntry : GridView.LibraryBookEntry
 	{
 		private bool _remove = false;
 		public RemovableGridEntry(LibraryBook libraryBook) : base(libraryBook) { }
diff --git a/Source/LibationWinForms/Form1.Designer.cs b/Source/LibationWinForms/Form1.Designer.cs
index 49c41b42..f4abad4f 100644
--- a/Source/LibationWinForms/Form1.Designer.cs
+++ b/Source/LibationWinForms/Form1.Designer.cs
@@ -72,7 +72,7 @@
 			this.addQuickFilterBtn = new System.Windows.Forms.Button();
 			this.splitContainer1 = new System.Windows.Forms.SplitContainer();
 			this.panel1 = new System.Windows.Forms.Panel();
-			this.productsDisplay = new LibationWinForms.ProductsDisplay();
+			this.productsDisplay = new LibationWinForms.GridView.ProductsDisplay();
 			this.toggleQueueHideBtn = new System.Windows.Forms.Button();
 			this.processBookQueue1 = new LibationWinForms.ProcessQueue.ProcessQueueControl();
 			this.menuStrip1.SuspendLayout();
@@ -583,6 +583,6 @@
 		private LibationWinForms.ProcessQueue.ProcessQueueControl processBookQueue1;
 		private System.Windows.Forms.Panel panel1;
 		private System.Windows.Forms.Button toggleQueueHideBtn;
-		private ProductsDisplay productsDisplay;
+		private LibationWinForms.GridView.ProductsDisplay productsDisplay;
 	}
 }
diff --git a/Source/LibationWinForms/grid/AsyncNotifyPropertyChanged.cs b/Source/LibationWinForms/GridView/AsyncNotifyPropertyChanged.cs
similarity index 94%
rename from Source/LibationWinForms/grid/AsyncNotifyPropertyChanged.cs
rename to Source/LibationWinForms/GridView/AsyncNotifyPropertyChanged.cs
index cce5e5b9..e4532cfe 100644
--- a/Source/LibationWinForms/grid/AsyncNotifyPropertyChanged.cs
+++ b/Source/LibationWinForms/GridView/AsyncNotifyPropertyChanged.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public abstract class AsyncNotifyPropertyChanged : SynchronizeInvoker, INotifyPropertyChanged
 	{
diff --git a/Source/LibationWinForms/grid/DataGridViewImageButtonCell.cs b/Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs
similarity index 92%
rename from Source/LibationWinForms/grid/DataGridViewImageButtonCell.cs
rename to Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs
index f4f25afd..d53b02ed 100644
--- a/Source/LibationWinForms/grid/DataGridViewImageButtonCell.cs
+++ b/Source/LibationWinForms/GridView/DataGridViewImageButtonCell.cs
@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class DataGridViewImageButtonCell : DataGridViewButtonCell
 	{
diff --git a/Source/LibationWinForms/grid/DescriptionDisplay.Designer.cs b/Source/LibationWinForms/GridView/DescriptionDisplay.Designer.cs
similarity index 98%
rename from Source/LibationWinForms/grid/DescriptionDisplay.Designer.cs
rename to Source/LibationWinForms/GridView/DescriptionDisplay.Designer.cs
index 96012e50..be8d9496 100644
--- a/Source/LibationWinForms/grid/DescriptionDisplay.Designer.cs
+++ b/Source/LibationWinForms/GridView/DescriptionDisplay.Designer.cs
@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class DescriptionDisplay
 	{
diff --git a/Source/LibationWinForms/grid/DescriptionDisplay.cs b/Source/LibationWinForms/GridView/DescriptionDisplay.cs
similarity index 97%
rename from Source/LibationWinForms/grid/DescriptionDisplay.cs
rename to Source/LibationWinForms/GridView/DescriptionDisplay.cs
index 3f95a92e..a39790d9 100644
--- a/Source/LibationWinForms/grid/DescriptionDisplay.cs
+++ b/Source/LibationWinForms/GridView/DescriptionDisplay.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public partial class DescriptionDisplay : Form
 	{
diff --git a/Source/LibationWinForms/grid/DescriptionDisplay.resx b/Source/LibationWinForms/GridView/DescriptionDisplay.resx
similarity index 100%
rename from Source/LibationWinForms/grid/DescriptionDisplay.resx
rename to Source/LibationWinForms/GridView/DescriptionDisplay.resx
diff --git a/Source/LibationWinForms/grid/EditTagsDataGridViewImageButtonColumn.cs b/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs
similarity index 98%
rename from Source/LibationWinForms/grid/EditTagsDataGridViewImageButtonColumn.cs
rename to Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs
index b0d9407e..065afdbb 100644
--- a/Source/LibationWinForms/grid/EditTagsDataGridViewImageButtonColumn.cs
+++ b/Source/LibationWinForms/GridView/EditTagsDataGridViewImageButtonColumn.cs
@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class EditTagsDataGridViewImageButtonColumn : DataGridViewButtonColumn
 	{
diff --git a/Source/LibationWinForms/grid/GridEntry.cs b/Source/LibationWinForms/GridView/GridEntry.cs
similarity index 99%
rename from Source/LibationWinForms/grid/GridEntry.cs
rename to Source/LibationWinForms/GridView/GridEntry.cs
index d26ae575..733bcac8 100644
--- a/Source/LibationWinForms/grid/GridEntry.cs
+++ b/Source/LibationWinForms/GridView/GridEntry.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public abstract class GridEntry : AsyncNotifyPropertyChanged, IMemberComparable
 	{
diff --git a/Source/LibationWinForms/grid/GridEntryBindingList.cs b/Source/LibationWinForms/GridView/GridEntryBindingList.cs
similarity index 99%
rename from Source/LibationWinForms/grid/GridEntryBindingList.cs
rename to Source/LibationWinForms/GridView/GridEntryBindingList.cs
index fb6f7df7..511e2ce6 100644
--- a/Source/LibationWinForms/grid/GridEntryBindingList.cs
+++ b/Source/LibationWinForms/GridView/GridEntryBindingList.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	/*
 	 * Allows filtering and sorting of the underlying BindingList<GridEntry>
diff --git a/Source/LibationWinForms/grid/ImageDisplay.Designer.cs b/Source/LibationWinForms/GridView/ImageDisplay.Designer.cs
similarity index 98%
rename from Source/LibationWinForms/grid/ImageDisplay.Designer.cs
rename to Source/LibationWinForms/GridView/ImageDisplay.Designer.cs
index ec1dbdf0..a1ca5caa 100644
--- a/Source/LibationWinForms/grid/ImageDisplay.Designer.cs
+++ b/Source/LibationWinForms/GridView/ImageDisplay.Designer.cs
@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class ImageDisplay
 	{
diff --git a/Source/LibationWinForms/grid/ImageDisplay.cs b/Source/LibationWinForms/GridView/ImageDisplay.cs
similarity index 98%
rename from Source/LibationWinForms/grid/ImageDisplay.cs
rename to Source/LibationWinForms/GridView/ImageDisplay.cs
index 53f75987..a6bfa574 100644
--- a/Source/LibationWinForms/grid/ImageDisplay.cs
+++ b/Source/LibationWinForms/GridView/ImageDisplay.cs
@@ -5,7 +5,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public partial class ImageDisplay : Form
 	{
diff --git a/Source/LibationWinForms/grid/ImageDisplay.resx b/Source/LibationWinForms/GridView/ImageDisplay.resx
similarity index 100%
rename from Source/LibationWinForms/grid/ImageDisplay.resx
rename to Source/LibationWinForms/GridView/ImageDisplay.resx
diff --git a/Source/LibationWinForms/grid/LiberateButtonStatus.cs b/Source/LibationWinForms/GridView/LiberateButtonStatus.cs
similarity index 96%
rename from Source/LibationWinForms/grid/LiberateButtonStatus.cs
rename to Source/LibationWinForms/GridView/LiberateButtonStatus.cs
index 8814eb24..3ee577fd 100644
--- a/Source/LibationWinForms/grid/LiberateButtonStatus.cs
+++ b/Source/LibationWinForms/GridView/LiberateButtonStatus.cs
@@ -1,7 +1,7 @@
 using DataLayer;
 using System;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class LiberateButtonStatus : IComparable
 	{
diff --git a/Source/LibationWinForms/grid/LiberateDataGridViewImageButtonColumn.cs b/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs
similarity index 98%
rename from Source/LibationWinForms/grid/LiberateDataGridViewImageButtonColumn.cs
rename to Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs
index feb9b0e0..a237b7a0 100644
--- a/Source/LibationWinForms/grid/LiberateDataGridViewImageButtonColumn.cs
+++ b/Source/LibationWinForms/GridView/LiberateDataGridViewImageButtonColumn.cs
@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using System.Linq;
 using DataLayer;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class LiberateDataGridViewImageButtonColumn : DataGridViewButtonColumn
 	{
diff --git a/Source/LibationWinForms/grid/LibraryBookEntry.cs b/Source/LibationWinForms/GridView/LibraryBookEntry.cs
similarity index 99%
rename from Source/LibationWinForms/grid/LibraryBookEntry.cs
rename to Source/LibationWinForms/GridView/LibraryBookEntry.cs
index 3834e502..5fc606a1 100644
--- a/Source/LibationWinForms/grid/LibraryBookEntry.cs
+++ b/Source/LibationWinForms/GridView/LibraryBookEntry.cs
@@ -6,7 +6,7 @@ using ApplicationServices;
 using DataLayer;
 using Dinah.Core;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	/// <summary>
 	/// The View Model for a LibraryBook
diff --git a/Source/LibationWinForms/grid/ProductsDisplay.Designer.cs b/Source/LibationWinForms/GridView/ProductsDisplay.Designer.cs
similarity index 70%
rename from Source/LibationWinForms/grid/ProductsDisplay.Designer.cs
rename to Source/LibationWinForms/GridView/ProductsDisplay.Designer.cs
index 8f561b0f..c4b1a543 100644
--- a/Source/LibationWinForms/grid/ProductsDisplay.Designer.cs
+++ b/Source/LibationWinForms/GridView/ProductsDisplay.Designer.cs
@@ -1,4 +1,4 @@
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	partial class ProductsDisplay
 	{
@@ -28,7 +28,7 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			this.productsGrid = new LibationWinForms.grid.ProductsGrid();
+			this.productsGrid = new LibationWinForms.GridView.ProductsGrid();
 			this.SuspendLayout();
 			// 
 			// productsGrid
@@ -39,10 +39,10 @@
 			this.productsGrid.Name = "productsGrid";
 			this.productsGrid.Size = new System.Drawing.Size(1510, 380);
 			this.productsGrid.TabIndex = 0;
-			this.productsGrid.LiberateClicked += new LibationWinForms.grid.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_LiberateClicked);
-			this.productsGrid.CoverClicked += new LibationWinForms.grid.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_CoverClicked);
-			this.productsGrid.DetailsClicked += new LibationWinForms.grid.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_DetailsClicked);
-			this.productsGrid.DescriptionClicked += new LibationWinForms.grid.ProductsGrid.LibraryBookEntryRectangleClickedEventHandler(this.productsGrid_DescriptionClicked);
+			this.productsGrid.LiberateClicked += new LibationWinForms.GridView.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_LiberateClicked);
+			this.productsGrid.CoverClicked += new LibationWinForms.GridView.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_CoverClicked);
+			this.productsGrid.DetailsClicked += new LibationWinForms.GridView.ProductsGrid.LibraryBookEntryClickedEventHandler(this.productsGrid_DetailsClicked);
+			this.productsGrid.DescriptionClicked += new LibationWinForms.GridView.ProductsGrid.LibraryBookEntryRectangleClickedEventHandler(this.productsGrid_DescriptionClicked);
 			this.productsGrid.VisibleCountChanged += new System.EventHandler<int>(this.productsGrid_VisibleCountChanged);
 			// 
 			// ProductsDisplay
@@ -59,6 +59,6 @@
 
 		#endregion
 
-		private grid.ProductsGrid productsGrid;
+		private GridView.ProductsGrid productsGrid;
 	}
 }
diff --git a/Source/LibationWinForms/grid/ProductsDisplay.cs b/Source/LibationWinForms/GridView/ProductsDisplay.cs
similarity index 99%
rename from Source/LibationWinForms/grid/ProductsDisplay.cs
rename to Source/LibationWinForms/GridView/ProductsDisplay.cs
index 6fc37fa0..66de694b 100644
--- a/Source/LibationWinForms/grid/ProductsDisplay.cs
+++ b/Source/LibationWinForms/GridView/ProductsDisplay.cs
@@ -10,7 +10,7 @@ using FileLiberator;
 using LibationFileManager;
 using LibationWinForms.Dialogs;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public partial class ProductsDisplay : UserControl
 	{
diff --git a/Source/LibationWinForms/grid/ProductsDisplay.resx b/Source/LibationWinForms/GridView/ProductsDisplay.resx
similarity index 100%
rename from Source/LibationWinForms/grid/ProductsDisplay.resx
rename to Source/LibationWinForms/GridView/ProductsDisplay.resx
diff --git a/Source/LibationWinForms/grid/ProductsGrid.Designer.cs b/Source/LibationWinForms/GridView/ProductsGrid.Designer.cs
similarity index 93%
rename from Source/LibationWinForms/grid/ProductsGrid.Designer.cs
rename to Source/LibationWinForms/GridView/ProductsGrid.Designer.cs
index fec72094..b380ff95 100644
--- a/Source/LibationWinForms/grid/ProductsGrid.Designer.cs
+++ b/Source/LibationWinForms/GridView/ProductsGrid.Designer.cs
@@ -1,4 +1,4 @@
-namespace LibationWinForms.grid
+namespace LibationWinForms.GridView
 {
 	partial class ProductsGrid
 	{
@@ -31,7 +31,7 @@
 			this.components = new System.ComponentModel.Container();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
 			this.gridEntryDataGridView = new System.Windows.Forms.DataGridView();
-			this.liberateGVColumn = new LibationWinForms.LiberateDataGridViewImageButtonColumn();
+			this.liberateGVColumn = new LibationWinForms.GridView.LiberateDataGridViewImageButtonColumn();
 			this.coverGVColumn = new System.Windows.Forms.DataGridViewImageColumn();
 			this.titleGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.authorsGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -44,9 +44,9 @@
 			this.purchaseDateGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.myRatingGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.miscGVColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.tagAndDetailsGVColumn = new LibationWinForms.EditTagsDataGridViewImageButtonColumn();
+			this.tagAndDetailsGVColumn = new LibationWinForms.GridView.EditTagsDataGridViewImageButtonColumn();
 			this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.syncBindingSource = new LibationWinForms.SyncBindingSource(this.components);
+			this.syncBindingSource = new LibationWinForms.GridView.SyncBindingSource(this.components);
 			((System.ComponentModel.ISupportInitialize)(this.gridEntryDataGridView)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.syncBindingSource)).BeginInit();
 			this.SuspendLayout();
@@ -60,20 +60,20 @@
 			this.gridEntryDataGridView.AutoGenerateColumns = false;
 			this.gridEntryDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.gridEntryDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.liberateGVColumn,
-            this.coverGVColumn,
-            this.titleGVColumn,
-            this.authorsGVColumn,
-            this.narratorsGVColumn,
-            this.lengthGVColumn,
-            this.seriesGVColumn,
-            this.descriptionGVColumn,
-            this.categoryGVColumn,
-            this.productRatingGVColumn,
-            this.purchaseDateGVColumn,
-            this.myRatingGVColumn,
-            this.miscGVColumn,
-            this.tagAndDetailsGVColumn});
+			this.liberateGVColumn,
+			this.coverGVColumn,
+			this.titleGVColumn,
+			this.authorsGVColumn,
+			this.narratorsGVColumn,
+			this.lengthGVColumn,
+			this.seriesGVColumn,
+			this.descriptionGVColumn,
+			this.categoryGVColumn,
+			this.productRatingGVColumn,
+			this.purchaseDateGVColumn,
+			this.myRatingGVColumn,
+			this.miscGVColumn,
+			this.tagAndDetailsGVColumn});
 			this.gridEntryDataGridView.ContextMenuStrip = this.contextMenuStrip1;
 			this.gridEntryDataGridView.DataSource = this.syncBindingSource;
 			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -214,7 +214,7 @@
 			// 
 			// syncBindingSource
 			// 
-			this.syncBindingSource.DataSource = typeof(LibationWinForms.GridEntry);
+			this.syncBindingSource.DataSource = typeof(LibationWinForms.GridView.GridEntry);
 			// 
 			// ProductsGrid
 			// 
diff --git a/Source/LibationWinForms/grid/ProductsGrid.cs b/Source/LibationWinForms/GridView/ProductsGrid.cs
similarity index 99%
rename from Source/LibationWinForms/grid/ProductsGrid.cs
rename to Source/LibationWinForms/GridView/ProductsGrid.cs
index 8e3cfe8d..5bf2a910 100644
--- a/Source/LibationWinForms/grid/ProductsGrid.cs
+++ b/Source/LibationWinForms/GridView/ProductsGrid.cs
@@ -8,7 +8,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace LibationWinForms.grid
+namespace LibationWinForms.GridView
 {
 	public partial class ProductsGrid : UserControl
 	{
diff --git a/Source/LibationWinForms/grid/ProductsGrid.resx b/Source/LibationWinForms/GridView/ProductsGrid.resx
similarity index 100%
rename from Source/LibationWinForms/grid/ProductsGrid.resx
rename to Source/LibationWinForms/GridView/ProductsGrid.resx
diff --git a/Source/LibationWinForms/grid/SeriesEntry.cs b/Source/LibationWinForms/GridView/SeriesEntry.cs
similarity index 99%
rename from Source/LibationWinForms/grid/SeriesEntry.cs
rename to Source/LibationWinForms/GridView/SeriesEntry.cs
index 9646c52f..17eb8125 100644
--- a/Source/LibationWinForms/grid/SeriesEntry.cs
+++ b/Source/LibationWinForms/GridView/SeriesEntry.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
 	public class SeriesEntry : GridEntry
 	{
diff --git a/Source/LibationWinForms/SyncBindingSource.cs b/Source/LibationWinForms/GridView/SyncBindingSource.cs
similarity index 96%
rename from Source/LibationWinForms/SyncBindingSource.cs
rename to Source/LibationWinForms/GridView/SyncBindingSource.cs
index 42d38ad9..5faafb0b 100644
--- a/Source/LibationWinForms/SyncBindingSource.cs
+++ b/Source/LibationWinForms/GridView/SyncBindingSource.cs
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Windows.Forms;
 
 // https://stackoverflow.com/a/32886415
-namespace LibationWinForms
+namespace LibationWinForms.GridView
 {
     public class SyncBindingSource : BindingSource
     {
diff --git a/Source/LibationWinForms/Properties/DataSources/LibationWinForm.GridEntry.datasource b/Source/LibationWinForms/Properties/DataSources/LibationWinForm.GridEntry.datasource
index ce0d9a71..48143915 100644
--- a/Source/LibationWinForms/Properties/DataSources/LibationWinForm.GridEntry.datasource
+++ b/Source/LibationWinForms/Properties/DataSources/LibationWinForm.GridEntry.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="GridEntry" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>LibationWinForms.GridEntry, LibationWinForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>LibationWinForms.GridView.GridEntry, LibationWinForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file