diff --git a/Sources/SQLKit/Builders/SQLAlterEnumBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLAlterEnumBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLAlterEnumBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLAlterEnumBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLAlterTableBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLAlterTableBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLAlterTableBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLAlterTableBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLConflictUpdateBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLConflictUpdateBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLConflictUpdateBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLConflictUpdateBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLCreateEnumBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLCreateEnumBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLCreateEnumBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLCreateEnumBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLCreateIndexBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLCreateIndexBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLCreateIndexBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLCreateIndexBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLCreateTableAsSubqueryBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLCreateTableAsSubqueryBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLCreateTableAsSubqueryBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLCreateTableAsSubqueryBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLCreateTableBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLCreateTableBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLCreateTableBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLCreateTableBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLCreateTriggerBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLCreateTriggerBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLCreateTriggerBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLCreateTriggerBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLDeleteBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLDeleteBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLDeleteBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLDeleteBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLDropEnumBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLDropEnumBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLDropEnumBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLDropEnumBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLDropIndexBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLDropIndexBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLDropIndexBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLDropIndexBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLDropTableBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLDropTableBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLDropTableBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLDropTableBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLDropTriggerBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLDropTriggerBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLDropTriggerBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLDropTriggerBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLInsertBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLInsertBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLInsertBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLInsertBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLPredicateGroupBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLPredicateGroupBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLPredicateGroupBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLPredicateGroupBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLRawBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLRawBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLRawBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLRawBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLSecondaryPredicateGroupBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLSecondaryPredicateGroupBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLSecondaryPredicateGroupBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLSecondaryPredicateGroupBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLSelectBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLSelectBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLSelectBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLSelectBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLUnionBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLUnionBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLUnionBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLUnionBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLUpdateBuilder.swift b/Sources/SQLKit/Builders/Implementations/SQLUpdateBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLUpdateBuilder.swift
rename to Sources/SQLKit/Builders/Implementations/SQLUpdateBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLColumnUpdateBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLColumnUpdateBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLColumnUpdateBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLColumnUpdateBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLJoinBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLJoinBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLJoinBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLJoinBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLPartialResultBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLPartialResultBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLPartialResultBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLPartialResultBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLPredicateBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLPredicateBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLPredicateBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLPredicateBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLQueryBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLQueryBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLQueryBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLQueryBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLQueryFetcher.swift b/Sources/SQLKit/Builders/Prototypes/SQLQueryFetcher.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLQueryFetcher.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLQueryFetcher.swift
diff --git a/Sources/SQLKit/Builders/SQLReturningBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLReturningBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLReturningBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLReturningBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLSecondaryPredicateBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLSecondaryPredicateBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLSecondaryPredicateBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLSecondaryPredicateBuilder.swift
diff --git a/Sources/SQLKit/Builders/SQLSubqeryClauseBuilder.swift b/Sources/SQLKit/Builders/Prototypes/SQLSubqueryClauseBuilder.swift
similarity index 100%
rename from Sources/SQLKit/Builders/SQLSubqeryClauseBuilder.swift
rename to Sources/SQLKit/Builders/Prototypes/SQLSubqueryClauseBuilder.swift
diff --git a/Sources/SQLKit/SQLDatabase.swift b/Sources/SQLKit/Database/SQLDatabase.swift
similarity index 100%
rename from Sources/SQLKit/SQLDatabase.swift
rename to Sources/SQLKit/Database/SQLDatabase.swift
diff --git a/Sources/SQLKit/SQLDatabaseReportedVersion.swift b/Sources/SQLKit/Database/SQLDatabaseReportedVersion.swift
similarity index 100%
rename from Sources/SQLKit/SQLDatabaseReportedVersion.swift
rename to Sources/SQLKit/Database/SQLDatabaseReportedVersion.swift
diff --git a/Sources/SQLKit/SQLDialect.swift b/Sources/SQLKit/Database/SQLDialect.swift
similarity index 100%
rename from Sources/SQLKit/SQLDialect.swift
rename to Sources/SQLKit/Database/SQLDialect.swift
diff --git a/Sources/SQLKit/SQLError.swift b/Sources/SQLKit/Deprecated/SQLError.swift
similarity index 100%
rename from Sources/SQLKit/SQLError.swift
rename to Sources/SQLKit/Deprecated/SQLError.swift
diff --git a/Sources/SQLKit/Query/SQLAlias.swift b/Sources/SQLKit/Expressions/Basics/SQLAlias.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLAlias.swift
rename to Sources/SQLKit/Expressions/Basics/SQLAlias.swift
diff --git a/Sources/SQLKit/Query/SQLColumnIdentifier.swift b/Sources/SQLKit/Expressions/Basics/SQLColumn.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLColumnIdentifier.swift
rename to Sources/SQLKit/Expressions/Basics/SQLColumn.swift
diff --git a/Sources/SQLKit/Query/SQLConstraint.swift b/Sources/SQLKit/Expressions/Basics/SQLConstraint.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLConstraint.swift
rename to Sources/SQLKit/Expressions/Basics/SQLConstraint.swift
diff --git a/Sources/SQLKit/Query/SQLDataType.swift b/Sources/SQLKit/Expressions/Basics/SQLDataType.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDataType.swift
rename to Sources/SQLKit/Expressions/Basics/SQLDataType.swift
diff --git a/Sources/SQLKit/Query/SQLDirection.swift b/Sources/SQLKit/Expressions/Basics/SQLDirection.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDirection.swift
rename to Sources/SQLKit/Expressions/Basics/SQLDirection.swift
diff --git a/Sources/SQLKit/Query/SQLDistinct.swift b/Sources/SQLKit/Expressions/Basics/SQLDistinct.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDistinct.swift
rename to Sources/SQLKit/Expressions/Basics/SQLDistinct.swift
diff --git a/Sources/SQLKit/Query/SQLForeignKeyAction.swift b/Sources/SQLKit/Expressions/Basics/SQLForeignKeyAction.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLForeignKeyAction.swift
rename to Sources/SQLKit/Expressions/Basics/SQLForeignKeyAction.swift
diff --git a/Sources/SQLKit/Query/SQLNestedSubpathExpression.swift b/Sources/SQLKit/Expressions/Basics/SQLNestedSubpathExpression.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLNestedSubpathExpression.swift
rename to Sources/SQLKit/Expressions/Basics/SQLNestedSubpathExpression.swift
diff --git a/Sources/SQLKit/Query/SQLAlterColumnDefinitionType.swift b/Sources/SQLKit/Expressions/Clauses/SQLAlterColumnDefinitionType.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLAlterColumnDefinitionType.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLAlterColumnDefinitionType.swift
diff --git a/Sources/SQLKit/Query/SQLColumnAssignment.swift b/Sources/SQLKit/Expressions/Clauses/SQLColumnAssignment.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLColumnAssignment.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLColumnAssignment.swift
diff --git a/Sources/SQLKit/Query/SQLColumnConstraintAlgorithm.swift b/Sources/SQLKit/Expressions/Clauses/SQLColumnConstraintAlgorithm.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLColumnConstraintAlgorithm.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLColumnConstraintAlgorithm.swift
diff --git a/Sources/SQLKit/Query/SQLColumnDefinition.swift b/Sources/SQLKit/Expressions/Clauses/SQLColumnDefinition.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLColumnDefinition.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLColumnDefinition.swift
diff --git a/Sources/SQLKit/Query/SQLConflictAction.swift b/Sources/SQLKit/Expressions/Clauses/SQLConflictAction.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLConflictAction.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLConflictAction.swift
diff --git a/Sources/SQLKit/Query/SQLConflictResolutionStrategy.swift b/Sources/SQLKit/Expressions/Clauses/SQLConflictResolutionStrategy.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLConflictResolutionStrategy.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLConflictResolutionStrategy.swift
diff --git a/Sources/SQLKit/Query/SQLDropBehaviour.swift b/Sources/SQLKit/Expressions/Clauses/SQLDropBehaviour.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDropBehaviour.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLDropBehaviour.swift
diff --git a/Sources/SQLKit/Query/SQLEnumDataType.swift b/Sources/SQLKit/Expressions/Clauses/SQLEnumDataType.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLEnumDataType.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLEnumDataType.swift
diff --git a/Sources/SQLKit/Query/SQLExcludedColumn.swift b/Sources/SQLKit/Expressions/Clauses/SQLExcludedColumn.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLExcludedColumn.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLExcludedColumn.swift
diff --git a/Sources/SQLKit/Query/SQLForeignKey.swift b/Sources/SQLKit/Expressions/Clauses/SQLForeignKey.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLForeignKey.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLForeignKey.swift
diff --git a/Sources/SQLKit/Query/SQLJoin.swift b/Sources/SQLKit/Expressions/Clauses/SQLJoin.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLJoin.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLJoin.swift
diff --git a/Sources/SQLKit/Query/SQLJoinMethod.swift b/Sources/SQLKit/Expressions/Clauses/SQLJoinMethod.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLJoinMethod.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLJoinMethod.swift
diff --git a/Sources/SQLKit/Query/SQLLockingClause.swift b/Sources/SQLKit/Expressions/Clauses/SQLLockingClause.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLLockingClause.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLLockingClause.swift
diff --git a/Sources/SQLKit/Query/SQLOrderBy.swift b/Sources/SQLKit/Expressions/Clauses/SQLOrderBy.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLOrderBy.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLOrderBy.swift
diff --git a/Sources/SQLKit/Query/SQLReturning.swift b/Sources/SQLKit/Expressions/Clauses/SQLReturning.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLReturning.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLReturning.swift
diff --git a/Sources/SQLKit/Query/SQLTableConstraintAlgorithm.swift b/Sources/SQLKit/Expressions/Clauses/SQLTableConstraintAlgorithm.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLTableConstraintAlgorithm.swift
rename to Sources/SQLKit/Expressions/Clauses/SQLTableConstraintAlgorithm.swift
diff --git a/Sources/SQLKit/Query/SQLAlterEnum.swift b/Sources/SQLKit/Expressions/Queries/SQLAlterEnum.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLAlterEnum.swift
rename to Sources/SQLKit/Expressions/Queries/SQLAlterEnum.swift
diff --git a/Sources/SQLKit/Query/SQLAlterTable.swift b/Sources/SQLKit/Expressions/Queries/SQLAlterTable.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLAlterTable.swift
rename to Sources/SQLKit/Expressions/Queries/SQLAlterTable.swift
diff --git a/Sources/SQLKit/Query/SQLCreateEnum.swift b/Sources/SQLKit/Expressions/Queries/SQLCreateEnum.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLCreateEnum.swift
rename to Sources/SQLKit/Expressions/Queries/SQLCreateEnum.swift
diff --git a/Sources/SQLKit/Query/SQLCreateIndex.swift b/Sources/SQLKit/Expressions/Queries/SQLCreateIndex.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLCreateIndex.swift
rename to Sources/SQLKit/Expressions/Queries/SQLCreateIndex.swift
diff --git a/Sources/SQLKit/Query/SQLCreateTable.swift b/Sources/SQLKit/Expressions/Queries/SQLCreateTable.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLCreateTable.swift
rename to Sources/SQLKit/Expressions/Queries/SQLCreateTable.swift
diff --git a/Sources/SQLKit/Query/SQLCreateTrigger.swift b/Sources/SQLKit/Expressions/Queries/SQLCreateTrigger.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLCreateTrigger.swift
rename to Sources/SQLKit/Expressions/Queries/SQLCreateTrigger.swift
diff --git a/Sources/SQLKit/Query/SQLDelete.swift b/Sources/SQLKit/Expressions/Queries/SQLDelete.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDelete.swift
rename to Sources/SQLKit/Expressions/Queries/SQLDelete.swift
diff --git a/Sources/SQLKit/Query/SQLDropEnum.swift b/Sources/SQLKit/Expressions/Queries/SQLDropEnum.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDropEnum.swift
rename to Sources/SQLKit/Expressions/Queries/SQLDropEnum.swift
diff --git a/Sources/SQLKit/Query/SQLDropIndex.swift b/Sources/SQLKit/Expressions/Queries/SQLDropIndex.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDropIndex.swift
rename to Sources/SQLKit/Expressions/Queries/SQLDropIndex.swift
diff --git a/Sources/SQLKit/Query/SQLDropTable.swift b/Sources/SQLKit/Expressions/Queries/SQLDropTable.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDropTable.swift
rename to Sources/SQLKit/Expressions/Queries/SQLDropTable.swift
diff --git a/Sources/SQLKit/Query/SQLDropTrigger.swift b/Sources/SQLKit/Expressions/Queries/SQLDropTrigger.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLDropTrigger.swift
rename to Sources/SQLKit/Expressions/Queries/SQLDropTrigger.swift
diff --git a/Sources/SQLKit/Query/SQLInsert.swift b/Sources/SQLKit/Expressions/Queries/SQLInsert.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLInsert.swift
rename to Sources/SQLKit/Expressions/Queries/SQLInsert.swift
diff --git a/Sources/SQLKit/Query/SQLSelect.swift b/Sources/SQLKit/Expressions/Queries/SQLSelect.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLSelect.swift
rename to Sources/SQLKit/Expressions/Queries/SQLSelect.swift
diff --git a/Sources/SQLKit/Query/SQLUnion.swift b/Sources/SQLKit/Expressions/Queries/SQLUnion.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLUnion.swift
rename to Sources/SQLKit/Expressions/Queries/SQLUnion.swift
diff --git a/Sources/SQLKit/Query/SQLUpdate.swift b/Sources/SQLKit/Expressions/Queries/SQLUpdate.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLUpdate.swift
rename to Sources/SQLKit/Expressions/Queries/SQLUpdate.swift
diff --git a/Sources/SQLKit/SQLExpression.swift b/Sources/SQLKit/Expressions/SQLExpression.swift
similarity index 100%
rename from Sources/SQLKit/SQLExpression.swift
rename to Sources/SQLKit/Expressions/SQLExpression.swift
diff --git a/Sources/SQLKit/SQLSerializer.swift b/Sources/SQLKit/Expressions/SQLSerializer.swift
similarity index 100%
rename from Sources/SQLKit/SQLSerializer.swift
rename to Sources/SQLKit/Expressions/SQLSerializer.swift
diff --git a/Sources/SQLKit/SQLStatement.swift b/Sources/SQLKit/Expressions/SQLStatement.swift
similarity index 100%
rename from Sources/SQLKit/SQLStatement.swift
rename to Sources/SQLKit/Expressions/SQLStatement.swift
diff --git a/Sources/SQLKit/Query/SQLBinaryExpression.swift b/Sources/SQLKit/Expressions/Syntax/SQLBinaryExpression.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLBinaryExpression.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLBinaryExpression.swift
diff --git a/Sources/SQLKit/Query/SQLBinaryOperator.swift b/Sources/SQLKit/Expressions/Syntax/SQLBinaryOperator.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLBinaryOperator.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLBinaryOperator.swift
diff --git a/Sources/SQLKit/Query/SQLBind.swift b/Sources/SQLKit/Expressions/Syntax/SQLBind.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLBind.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLBind.swift
diff --git a/Sources/SQLKit/Query/SQLFunction.swift b/Sources/SQLKit/Expressions/Syntax/SQLFunction.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLFunction.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLFunction.swift
diff --git a/Sources/SQLKit/Query/SQLGroupExpression.swift b/Sources/SQLKit/Expressions/Syntax/SQLGroupExpression.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLGroupExpression.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLGroupExpression.swift
diff --git a/Sources/SQLKit/Query/SQLIdentifier.swift b/Sources/SQLKit/Expressions/Syntax/SQLIdentifier.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLIdentifier.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLIdentifier.swift
diff --git a/Sources/SQLKit/Query/SQLList.swift b/Sources/SQLKit/Expressions/Syntax/SQLList.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLList.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLList.swift
diff --git a/Sources/SQLKit/Query/SQLLiteral.swift b/Sources/SQLKit/Expressions/Syntax/SQLLiteral.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLLiteral.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLLiteral.swift
diff --git a/Sources/SQLKit/Query/SQLQueryString.swift b/Sources/SQLKit/Expressions/Syntax/SQLQueryString.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLQueryString.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLQueryString.swift
diff --git a/Sources/SQLKit/Query/SQLRaw.swift b/Sources/SQLKit/Expressions/Syntax/SQLRaw.swift
similarity index 100%
rename from Sources/SQLKit/Query/SQLRaw.swift
rename to Sources/SQLKit/Expressions/Syntax/SQLRaw.swift
diff --git a/Sources/SQLKit/SQLQueryEncoder.swift b/Sources/SQLKit/Rows/SQLQueryEncoder.swift
similarity index 100%
rename from Sources/SQLKit/SQLQueryEncoder.swift
rename to Sources/SQLKit/Rows/SQLQueryEncoder.swift
diff --git a/Sources/SQLKit/SQLRow.swift b/Sources/SQLKit/Rows/SQLRow.swift
similarity index 100%
rename from Sources/SQLKit/SQLRow.swift
rename to Sources/SQLKit/Rows/SQLRow.swift
diff --git a/Sources/SQLKit/SQLRowDecoder.swift b/Sources/SQLKit/Rows/SQLRowDecoder.swift
similarity index 99%
rename from Sources/SQLKit/SQLRowDecoder.swift
rename to Sources/SQLKit/Rows/SQLRowDecoder.swift
index 4dbd98af..e99bd041 100644
--- a/Sources/SQLKit/SQLRowDecoder.swift
+++ b/Sources/SQLKit/Rows/SQLRowDecoder.swift
@@ -17,7 +17,6 @@ public struct SQLRowDecoder {
 
     public enum KeyDecodingStrategy {
         case useDefaultKeys
-        // converts rows in snake_case to from coding keys in camelCase to 
         case convertFromSnakeCase
         case custom(([CodingKey]) -> CodingKey)
     }