diff --git a/src/AddIns/Misc/SharpDbTools/Project/Src/Service/ColumnNames.cs b/src/AddIns/Misc/SharpDbTools/Project/Src/Data/ColumnNames.cs
similarity index 100%
rename from src/AddIns/Misc/SharpDbTools/Project/Src/Service/ColumnNames.cs
rename to src/AddIns/Misc/SharpDbTools/Project/Src/Data/ColumnNames.cs
diff --git a/src/AddIns/Misc/SharpDbTools/Project/Src/Service/DbModelInfo.cs b/src/AddIns/Misc/SharpDbTools/Project/Src/Data/DbModelInfo.cs
similarity index 100%
rename from src/AddIns/Misc/SharpDbTools/Project/Src/Service/DbModelInfo.cs
rename to src/AddIns/Misc/SharpDbTools/Project/Src/Data/DbModelInfo.cs
diff --git a/src/AddIns/Misc/SharpDbTools/Project/Src/Service/DbModelInfoService.cs b/src/AddIns/Misc/SharpDbTools/Project/Src/Data/DbModelInfoService.cs
similarity index 100%
rename from src/AddIns/Misc/SharpDbTools/Project/Src/Service/DbModelInfoService.cs
rename to src/AddIns/Misc/SharpDbTools/Project/Src/Data/DbModelInfoService.cs
diff --git a/src/AddIns/Misc/SharpDbTools/Project/Src/Service/TableNames.cs b/src/AddIns/Misc/SharpDbTools/Project/Src/Data/TableNames.cs
similarity index 100%
rename from src/AddIns/Misc/SharpDbTools/Project/Src/Service/TableNames.cs
rename to src/AddIns/Misc/SharpDbTools/Project/Src/Data/TableNames.cs
diff --git a/src/AddIns/Misc/SharpDbTools/Project/Src/UI/TableDescribeViewContent.cs b/src/AddIns/Misc/SharpDbTools/Project/Src/Forms/TableDescribeViewContent.cs
similarity index 100%
rename from src/AddIns/Misc/SharpDbTools/Project/Src/UI/TableDescribeViewContent.cs
rename to src/AddIns/Misc/SharpDbTools/Project/Src/Forms/TableDescribeViewContent.cs