diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs
index 09b2169507..a77fa98d12 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlBoxCompilers.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2026 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
@@ -6,6 +6,7 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -15,49 +16,49 @@ internal class NpgsqlBoxCompilers
   {
     #region Extractors
 
-    [Compiler(typeof(NpgsqlBox), "UpperRight", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.UpperRight), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlBoxExtractUpperRightPoint(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0);
     }
 
-    [Compiler(typeof(NpgsqlBox), "LowerLeft", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.LowerLeft), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlBoxExtractLowerLeftPoint(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1);
     }
 
-    [Compiler(typeof(NpgsqlBox), "Right", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Right), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractRight(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractX(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0));
     }
 
-    [Compiler(typeof(NpgsqlBox), "Top", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Top), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractTop(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractY(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0));
     }
 
-    [Compiler(typeof(NpgsqlBox), "Left", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Left), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractLeft(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractX(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1));
     }
 
-    [Compiler(typeof(NpgsqlBox), "Bottom", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Bottom), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractBottom(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractY(PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1));
     }
 
-    [Compiler(typeof(NpgsqlBox), "Height", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Height), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractHeight(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlBoxExtractHeight(_this);
     }
 
-    [Compiler(typeof(NpgsqlBox), "Width", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlBox), nameof(NpgsqlBox.Width), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractWidth(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlBoxExtractWidth(_this);
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs
index 5e4d1123f2..f389dfcbb9 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlCircleCompilers.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2026 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
@@ -6,6 +6,7 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -15,13 +16,13 @@ internal class NpgsqlCircleCompilers
   {
     #region Extractors
 
-    [Compiler(typeof(NpgsqlCircle), "Center", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlCircle), nameof(NpgsqlCircle.Center), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlCircleExtractCenterPoint(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlCircleExtractCenter(_this);
     }
 
-    [Compiler(typeof(NpgsqlCircle), "Radius", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlCircle), nameof(NpgsqlCircle.Radius), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlCircleExtractRadius(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlCircleExtractRadius(_this);
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs
index 6f22298de7..dab8a1301b 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlLSegCompilers.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2026 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
@@ -6,6 +6,7 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -15,13 +16,13 @@ internal static class NpgsqlLSegCompilers
   {
     #region Extractors
 
-    [Compiler(typeof(NpgsqlLSeg), "Start", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlLSeg), nameof(NpgsqlLSeg.Start), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlLSegExtractStartPoint(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 0);
     }
 
-    [Compiler(typeof(NpgsqlLSeg), "End", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlLSeg), nameof(NpgsqlLSeg.End), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlLSegExtractEndPoint(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlTypeExtractPoint(_this, 1);
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs
index 4f8ada0aa5..b83c5836d2 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPathCompilers.cs
@@ -6,29 +6,51 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
+using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
 {
   [CompilerContainer(typeof(SqlExpression))]
   internal class NpgsqlPathCompilers
   {
-    [Compiler(typeof(NpgsqlPath), "Count", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Count), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPathCount(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPathAndPolygonCount(_this);
     }
 
-    [Compiler(typeof(NpgsqlPath), "Open", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Open), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPathOpen(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPathAndPolygonOpen(_this);
     }
 
-    [Compiler(typeof(NpgsqlPath), "Contains", TargetKind.Method)]
+    [Compiler(typeof(NpgsqlPath), nameof(NpgsqlPath.Contains), TargetKind.Method)]
     public static SqlExpression NpgsqlPathContains(SqlExpression _this,
       [Type(typeof(NpgsqlPoint))] SqlExpression point)
     {
       return PostgresqlSqlDml.NpgsqlPathAndPolygonContains(_this, point);
     }
+
+    #region Operators
+
+    [Compiler(typeof(NpgsqlPath), Operator.Equality, TargetKind.Operator)]
+    public static SqlExpression NpgsqlPathOperatorEquality(
+      [Type(typeof(NpgsqlPath))] SqlExpression left,
+      [Type(typeof(NpgsqlPath))] SqlExpression right)
+    {
+      return PostgresqlSqlDml.NpgsqlTypeOperatorEquality(left, right);
+    }
+
+    [Compiler(typeof(NpgsqlPath), Operator.Inequality, TargetKind.Operator)]
+    public static SqlExpression NpgsqlPathOperatorInequality(
+      [Type(typeof(NpgsqlPath))] SqlExpression left,
+      [Type(typeof(NpgsqlPath))] SqlExpression right)
+    {
+      return !NpgsqlPathOperatorEquality(left, right);
+    }
+
+    #endregion
   }
 }
\ No newline at end of file
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs
index 1870b57751..88b6b8bc7f 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPointCompilers.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2026 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
@@ -6,6 +6,7 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -15,13 +16,13 @@ internal static class NpgsqlPointCompilers
   {
     #region Extractors
 
-    [Compiler(typeof(NpgsqlPoint), "X", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlPoint), nameof(NpgsqlPoint.X), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractX(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractX(_this);
     }
 
-    [Compiler(typeof(NpgsqlPoint), "Y", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlPoint), nameof(NpgsqlPoint.Y), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPointExtractY(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPointExtractY(_this);
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs
index 7b45156ce6..f0c76fd518 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/NpgsqlPolygonCompilers.cs
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020 Xtensive LLC.
+// Copyright (C) 2014-2026 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
@@ -6,6 +6,7 @@
 
 using NpgsqlTypes;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Operator = Xtensive.Reflection.WellKnown.Operator;
 
 namespace Xtensive.Orm.Providers.PostgreSql
@@ -13,13 +14,13 @@ namespace Xtensive.Orm.Providers.PostgreSql
   [CompilerContainer(typeof(SqlExpression))]
   internal class NpgsqlPolygonCompilers
   {
-    [Compiler(typeof(NpgsqlPolygon), "Count", TargetKind.PropertyGet)]
+    [Compiler(typeof(NpgsqlPolygon), nameof(NpgsqlPolygon.Count), TargetKind.PropertyGet)]
     public static SqlExpression NpgsqlPolygonCount(SqlExpression _this)
     {
       return PostgresqlSqlDml.NpgsqlPathAndPolygonCount(_this);
     }
 
-    [Compiler(typeof(NpgsqlPolygon), "Contains", TargetKind.Method)]
+    [Compiler(typeof(NpgsqlPolygon), nameof(NpgsqlPolygon.Contains), TargetKind.Method)]
     public static SqlExpression NpgsqlPolygonContains(SqlExpression _this,
       [Type(typeof(NpgsqlPoint))] SqlExpression point)
     {
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs
index 6de659947f..44a202f298 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/SqlCompiler.cs
@@ -14,6 +14,7 @@
 using Xtensive.Reflection.PostgreSql;
 using Xtensive.Sql;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 
 namespace Xtensive.Orm.Providers.PostgreSql
 {
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs
similarity index 99%
rename from Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs
index 2a530e46b8..b0b16346a4 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlDml.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlDml.cs
@@ -9,7 +9,7 @@
 using Xtensive.Sql;
 using Xtensive.Sql.Dml;
 
-namespace Xtensive.Orm.Providers.PostgreSql
+namespace Xtensive.Sql.Dml.PostgreSql
 {
   /// <summary>
   /// A factory for SQL DML operations for Postgresql DBMS.
diff --git a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs
similarity index 99%
rename from Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs
index 6332f2fe2e..8779b59dbd 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Orm.Providers.PostgreSql/PostgresqlSqlFunctionType.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Dml/PostgresqlSqlFunctionType.cs
@@ -6,7 +6,7 @@
 
 using Xtensive.Sql.Dml;
 
-namespace Xtensive.Orm.Providers.PostgreSql
+namespace Xtensive.Sql.Dml.PostgreSql
 {
  /// <summary>
   /// Contains additional provider-specific SQL functions.
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Connection.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Connection.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Driver.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Driver.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Driver.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/DriverFactory.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/DriverFactory.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreServerInfo.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreServerInfo.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreServerInfo.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreServerInfo.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlHelper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlHelper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlHelper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlTypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlTypeMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/PostgreSqlTypeMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/PostgreSqlTypeMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/RelOptions.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/RelOptions.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/RelOptions.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/RelOptions.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs
similarity index 98%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs
index b26114fa3f..9c8d9a2fcc 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.Designer.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.Designer.cs
@@ -19,7 +19,7 @@ namespace Xtensive.Sql.Drivers.PostgreSql.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.resx b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.resx
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Resources/Strings.resx
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/Resources/Strings.resx
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/BoxMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/BoxMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/BoxMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/BoxMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CircleMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CircleMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CircleMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CircleMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs
similarity index 99%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs
index 3b7262696f..64a3d2cf2a 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Compiler.cs
+++ b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Compiler.cs
@@ -8,9 +8,8 @@
 using Xtensive.Sql.Compiler;
 using Xtensive.Sql.Ddl;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 using Xtensive.Sql.Model;
-using Xtensive.Sql.Drivers.PostgreSql.Resources;
-using Xtensive.Orm.Providers.PostgreSql;
 using SqlCompiler = Xtensive.Sql.Compiler.SqlCompiler;
 
 namespace Xtensive.Sql.Drivers.PostgreSql.v11_0
@@ -789,7 +788,7 @@ public override void Visit(SqlCreateIndex node, IndexColumn item)
     public override void Visit(SqlFreeTextTable node)
     {
       if (node.TargetColumns.Count != 1 || node.TargetColumns[0] != node.TargetTable.Asterisk) {
-        throw new NotSupportedException(Strings.ExFreeTextSearchOnCustomColumnsNotSupported);
+        throw new NotSupportedException(Resources.Strings.ExFreeTextSearchOnCustomColumnsNotSupported);
       }
 
       var fullTextIndex = node.TargetTable.DataTable.Indexes.OfType<FullTextIndex>().Single();
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CustomSqlType.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CustomSqlType.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/CustomSqlType.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/CustomSqlType.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Driver.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Driver.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Driver.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Extractor.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Extractor.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Extractor.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Extractor.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/LSegMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/LSegMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/LSegMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/LSegMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PathMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PathMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PathMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PathMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PointMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PointMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PointMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PointMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PolygonMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PolygonMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/PolygonMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/PolygonMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/ServerInfoProvider.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/ServerInfoProvider.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/ServerInfoProvider.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/ServerInfoProvider.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Translator.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Translator.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/Translator.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/Translator.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/TypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/TypeMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v11_0/TypeMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v11_0/TypeMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Compiler.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Compiler.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Compiler.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Compiler.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Driver.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Driver.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Driver.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Driver.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Extractor.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Extractor.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Extractor.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Extractor.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/ServerInfoProvider.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/ServerInfoProvider.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/ServerInfoProvider.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/ServerInfoProvider.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Translator.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Translator.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/Translator.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/Translator.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/TypeMapper.cs b/Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/TypeMapper.cs
similarity index 100%
rename from Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v12_0/TypeMapper.cs
rename to Orm/Xtensive.Orm.PostgreSql/Sql/Drivers.PostgreSql/v12_0/TypeMapper.cs
diff --git a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj
index c0f6771846..1f0b91432b 100644
--- a/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj
+++ b/Orm/Xtensive.Orm.PostgreSql/Xtensive.Orm.PostgreSql.csproj
@@ -36,12 +36,13 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Sql.Drivers.PostgreSql\Resources\Strings.resx">
+    <None Include="Sql\Drivers.PostgreSql\Resources\Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
       <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>Xtensive.Sql.Drivers.PostgreSql.Resources</CustomToolNamespace>
     </None>
-    <Compile Update="Sql.Drivers.PostgreSql\Resources\Strings.Designer.cs">
+    <Compile Update="Sql\Drivers.PostgreSql\Resources\Strings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Strings.resx</DependentUpon>
diff --git a/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs b/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs
index 6f48105eba..c786c8e48a 100644
--- a/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs
+++ b/Orm/Xtensive.Orm.Tests.Sql/PostgreSql/NpgsqlTypeConstructorTest.cs
@@ -1,14 +1,14 @@
-// Copyright (C) 2013 Xtensive LLC.
-// All rights reserved.
-// For conditions of distribution and use, see license.
+// Copyright (C) 2014-2026 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
 // Created by: Alena Mikshina
 // Created:    2014.05.14
 
 using System;
 using NUnit.Framework;
-using Xtensive.Orm.Providers.PostgreSql;
 using Xtensive.Sql;
 using Xtensive.Sql.Dml;
+using Xtensive.Sql.Dml.PostgreSql;
 
 namespace Xtensive.Orm.Tests.Sql.PostgreSql
 {