diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs b/AIStudio.Wpf.DiagramDesigner/Common/BindableBase.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/BindableBase.cs
rename to AIStudio.Wpf.DiagramDesigner/Common/BindableBase.cs
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs b/AIStudio.Wpf.DiagramDesigner/Common/SimpleCommand.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/SimpleCommand.cs
rename to AIStudio.Wpf.DiagramDesigner/Common/SimpleCommand.cs
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
index 86d0158..c6cd60f 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
@@ -133,7 +133,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
 
         #region Helper methods
 
-        private void DragLeft(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragLeft(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
 
@@ -147,7 +147,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
             }
         }
 
-        private void DragTop(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragTop(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
             double groupBottom = item.Top + item.GetItemHeight();
@@ -160,7 +160,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
             }
         }
 
-        private void DragRight(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragRight(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
 
@@ -175,7 +175,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
             }
         }
 
-        private void DragBottom(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
+        private void DragBottom(double scale, DesignerItemViewModelBase item, DiagramSelectionService selectionService)
         {
             IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
             double groupTop = item.Top;
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs
similarity index 96%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs
index 7ddf190..bcaa364 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramSelectionService.cs
@@ -5,11 +5,11 @@ using System.Text;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
-    public class SelectionService
+    public class DiagramSelectionService
     {
         private IDiagramViewModel DiagramViewModel;
 
-        public SelectionService(IDiagramViewModel diagramViewModel)
+        public DiagramSelectionService(IDiagramViewModel diagramViewModel)
         {
             this.DiagramViewModel = diagramViewModel;
         }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
index ef3c9ea..1cc18f0 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
@@ -40,13 +40,13 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
-        private SelectionService selectionService;
-        public SelectionService SelectionService
+        private DiagramSelectionService selectionService;
+        public DiagramSelectionService SelectionService
         {
             get
             {
                 if (selectionService == null)
-                    selectionService = new SelectionService(this);
+                    selectionService = new DiagramSelectionService(this);
 
                 return selectionService;
             }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IAttachTo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IAttachTo.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IAttachTo.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IAttachTo.cs
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramServiceProvider.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramServiceProvider.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramServiceProvider.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramServiceProvider.cs
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs
similarity index 99%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs
index 2805bf7..97c56a4 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/IDiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IDiagramViewModel.cs
@@ -28,7 +28,7 @@ namespace AIStudio.Wpf.DiagramDesigner
         {
             get;
         }
-        SelectionService SelectionService
+        DiagramSelectionService SelectionService
         {
             get;
         }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IGroupable.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/IGroupable.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/IGroupable.cs
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/ISelectable.cs
similarity index 100%
rename from AIStudio.Wpf.DiagramDesigner/ViewModels/ISelectable.cs
rename to AIStudio.Wpf.DiagramDesigner/ViewModels/Interface/ISelectable.cs