diff --git a/src/org/hsqldb/ClientConnection.java b/src/main/java/org/hsqldb/ClientConnection.java
similarity index 100%
rename from src/org/hsqldb/ClientConnection.java
rename to src/main/java/org/hsqldb/ClientConnection.java
diff --git a/src/org/hsqldb/ClientConnectionHTTP.java b/src/main/java/org/hsqldb/ClientConnectionHTTP.java
similarity index 100%
rename from src/org/hsqldb/ClientConnectionHTTP.java
rename to src/main/java/org/hsqldb/ClientConnectionHTTP.java
diff --git a/src/org/hsqldb/ColumnBase.java b/src/main/java/org/hsqldb/ColumnBase.java
similarity index 100%
rename from src/org/hsqldb/ColumnBase.java
rename to src/main/java/org/hsqldb/ColumnBase.java
diff --git a/src/org/hsqldb/ColumnSchema.java b/src/main/java/org/hsqldb/ColumnSchema.java
similarity index 100%
rename from src/org/hsqldb/ColumnSchema.java
rename to src/main/java/org/hsqldb/ColumnSchema.java
diff --git a/src/org/hsqldb/Constraint.java b/src/main/java/org/hsqldb/Constraint.java
similarity index 100%
rename from src/org/hsqldb/Constraint.java
rename to src/main/java/org/hsqldb/Constraint.java
diff --git a/src/org/hsqldb/ConstraintCore.java b/src/main/java/org/hsqldb/ConstraintCore.java
similarity index 100%
rename from src/org/hsqldb/ConstraintCore.java
rename to src/main/java/org/hsqldb/ConstraintCore.java
diff --git a/src/org/hsqldb/Database.java b/src/main/java/org/hsqldb/Database.java
similarity index 100%
rename from src/org/hsqldb/Database.java
rename to src/main/java/org/hsqldb/Database.java
diff --git a/src/org/hsqldb/DatabaseManager.java b/src/main/java/org/hsqldb/DatabaseManager.java
similarity index 100%
rename from src/org/hsqldb/DatabaseManager.java
rename to src/main/java/org/hsqldb/DatabaseManager.java
diff --git a/src/org/hsqldb/DatabaseType.java b/src/main/java/org/hsqldb/DatabaseType.java
similarity index 100%
rename from src/org/hsqldb/DatabaseType.java
rename to src/main/java/org/hsqldb/DatabaseType.java
diff --git a/src/org/hsqldb/DatabaseURL.java b/src/main/java/org/hsqldb/DatabaseURL.java
similarity index 100%
rename from src/org/hsqldb/DatabaseURL.java
rename to src/main/java/org/hsqldb/DatabaseURL.java
diff --git a/src/org/hsqldb/Expression.java b/src/main/java/org/hsqldb/Expression.java
similarity index 100%
rename from src/org/hsqldb/Expression.java
rename to src/main/java/org/hsqldb/Expression.java
diff --git a/src/org/hsqldb/ExpressionAccessor.java b/src/main/java/org/hsqldb/ExpressionAccessor.java
similarity index 100%
rename from src/org/hsqldb/ExpressionAccessor.java
rename to src/main/java/org/hsqldb/ExpressionAccessor.java
diff --git a/src/org/hsqldb/ExpressionAggregate.java b/src/main/java/org/hsqldb/ExpressionAggregate.java
similarity index 100%
rename from src/org/hsqldb/ExpressionAggregate.java
rename to src/main/java/org/hsqldb/ExpressionAggregate.java
diff --git a/src/org/hsqldb/ExpressionArithmetic.java b/src/main/java/org/hsqldb/ExpressionArithmetic.java
similarity index 100%
rename from src/org/hsqldb/ExpressionArithmetic.java
rename to src/main/java/org/hsqldb/ExpressionArithmetic.java
diff --git a/src/org/hsqldb/ExpressionArrayAggregate.java b/src/main/java/org/hsqldb/ExpressionArrayAggregate.java
similarity index 100%
rename from src/org/hsqldb/ExpressionArrayAggregate.java
rename to src/main/java/org/hsqldb/ExpressionArrayAggregate.java
diff --git a/src/org/hsqldb/ExpressionColumn.java b/src/main/java/org/hsqldb/ExpressionColumn.java
similarity index 100%
rename from src/org/hsqldb/ExpressionColumn.java
rename to src/main/java/org/hsqldb/ExpressionColumn.java
diff --git a/src/org/hsqldb/ExpressionColumnAccessor.java b/src/main/java/org/hsqldb/ExpressionColumnAccessor.java
similarity index 100%
rename from src/org/hsqldb/ExpressionColumnAccessor.java
rename to src/main/java/org/hsqldb/ExpressionColumnAccessor.java
diff --git a/src/org/hsqldb/ExpressionLike.java b/src/main/java/org/hsqldb/ExpressionLike.java
similarity index 100%
rename from src/org/hsqldb/ExpressionLike.java
rename to src/main/java/org/hsqldb/ExpressionLike.java
diff --git a/src/org/hsqldb/ExpressionLogical.java b/src/main/java/org/hsqldb/ExpressionLogical.java
similarity index 100%
rename from src/org/hsqldb/ExpressionLogical.java
rename to src/main/java/org/hsqldb/ExpressionLogical.java
diff --git a/src/org/hsqldb/ExpressionOp.java b/src/main/java/org/hsqldb/ExpressionOp.java
similarity index 100%
rename from src/org/hsqldb/ExpressionOp.java
rename to src/main/java/org/hsqldb/ExpressionOp.java
diff --git a/src/org/hsqldb/ExpressionOrderBy.java b/src/main/java/org/hsqldb/ExpressionOrderBy.java
similarity index 100%
rename from src/org/hsqldb/ExpressionOrderBy.java
rename to src/main/java/org/hsqldb/ExpressionOrderBy.java
diff --git a/src/org/hsqldb/ExpressionTable.java b/src/main/java/org/hsqldb/ExpressionTable.java
similarity index 100%
rename from src/org/hsqldb/ExpressionTable.java
rename to src/main/java/org/hsqldb/ExpressionTable.java
diff --git a/src/org/hsqldb/ExpressionValue.java b/src/main/java/org/hsqldb/ExpressionValue.java
similarity index 100%
rename from src/org/hsqldb/ExpressionValue.java
rename to src/main/java/org/hsqldb/ExpressionValue.java
diff --git a/src/org/hsqldb/FunctionCustom.java b/src/main/java/org/hsqldb/FunctionCustom.java
similarity index 100%
rename from src/org/hsqldb/FunctionCustom.java
rename to src/main/java/org/hsqldb/FunctionCustom.java
diff --git a/src/org/hsqldb/FunctionSQL.java b/src/main/java/org/hsqldb/FunctionSQL.java
similarity index 100%
rename from src/org/hsqldb/FunctionSQL.java
rename to src/main/java/org/hsqldb/FunctionSQL.java
diff --git a/src/org/hsqldb/FunctionSQLInvoked.java b/src/main/java/org/hsqldb/FunctionSQLInvoked.java
similarity index 100%
rename from src/org/hsqldb/FunctionSQLInvoked.java
rename to src/main/java/org/hsqldb/FunctionSQLInvoked.java
diff --git a/src/org/hsqldb/HsqlDateTime.java b/src/main/java/org/hsqldb/HsqlDateTime.java
similarity index 100%
rename from src/org/hsqldb/HsqlDateTime.java
rename to src/main/java/org/hsqldb/HsqlDateTime.java
diff --git a/src/org/hsqldb/HsqlException.java b/src/main/java/org/hsqldb/HsqlException.java
similarity index 100%
rename from src/org/hsqldb/HsqlException.java
rename to src/main/java/org/hsqldb/HsqlException.java
diff --git a/src/org/hsqldb/HsqlNameManager.java b/src/main/java/org/hsqldb/HsqlNameManager.java
similarity index 100%
rename from src/org/hsqldb/HsqlNameManager.java
rename to src/main/java/org/hsqldb/HsqlNameManager.java
diff --git a/src/org/hsqldb/Like.java b/src/main/java/org/hsqldb/Like.java
similarity index 100%
rename from src/org/hsqldb/Like.java
rename to src/main/java/org/hsqldb/Like.java
diff --git a/src/org/hsqldb/NumberSequence.java b/src/main/java/org/hsqldb/NumberSequence.java
similarity index 100%
rename from src/org/hsqldb/NumberSequence.java
rename to src/main/java/org/hsqldb/NumberSequence.java
diff --git a/src/org/hsqldb/OpTypes.java b/src/main/java/org/hsqldb/OpTypes.java
similarity index 100%
rename from src/org/hsqldb/OpTypes.java
rename to src/main/java/org/hsqldb/OpTypes.java
diff --git a/src/org/hsqldb/ParserBase.java b/src/main/java/org/hsqldb/ParserBase.java
similarity index 100%
rename from src/org/hsqldb/ParserBase.java
rename to src/main/java/org/hsqldb/ParserBase.java
diff --git a/src/org/hsqldb/ParserCommand.java b/src/main/java/org/hsqldb/ParserCommand.java
similarity index 100%
rename from src/org/hsqldb/ParserCommand.java
rename to src/main/java/org/hsqldb/ParserCommand.java
diff --git a/src/org/hsqldb/ParserDDL.java b/src/main/java/org/hsqldb/ParserDDL.java
similarity index 100%
rename from src/org/hsqldb/ParserDDL.java
rename to src/main/java/org/hsqldb/ParserDDL.java
diff --git a/src/org/hsqldb/ParserDML.java b/src/main/java/org/hsqldb/ParserDML.java
similarity index 100%
rename from src/org/hsqldb/ParserDML.java
rename to src/main/java/org/hsqldb/ParserDML.java
diff --git a/src/org/hsqldb/ParserDQL.java b/src/main/java/org/hsqldb/ParserDQL.java
similarity index 100%
rename from src/org/hsqldb/ParserDQL.java
rename to src/main/java/org/hsqldb/ParserDQL.java
diff --git a/src/org/hsqldb/ParserRoutine.java b/src/main/java/org/hsqldb/ParserRoutine.java
similarity index 100%
rename from src/org/hsqldb/ParserRoutine.java
rename to src/main/java/org/hsqldb/ParserRoutine.java
diff --git a/src/org/hsqldb/ParserTable.java b/src/main/java/org/hsqldb/ParserTable.java
similarity index 100%
rename from src/org/hsqldb/ParserTable.java
rename to src/main/java/org/hsqldb/ParserTable.java
diff --git a/src/org/hsqldb/QueryExpression.java b/src/main/java/org/hsqldb/QueryExpression.java
similarity index 100%
rename from src/org/hsqldb/QueryExpression.java
rename to src/main/java/org/hsqldb/QueryExpression.java
diff --git a/src/org/hsqldb/QuerySpecification.java b/src/main/java/org/hsqldb/QuerySpecification.java
similarity index 100%
rename from src/org/hsqldb/QuerySpecification.java
rename to src/main/java/org/hsqldb/QuerySpecification.java
diff --git a/src/org/hsqldb/RangeGroup.java b/src/main/java/org/hsqldb/RangeGroup.java
similarity index 100%
rename from src/org/hsqldb/RangeGroup.java
rename to src/main/java/org/hsqldb/RangeGroup.java
diff --git a/src/org/hsqldb/RangeVariable.java b/src/main/java/org/hsqldb/RangeVariable.java
similarity index 100%
rename from src/org/hsqldb/RangeVariable.java
rename to src/main/java/org/hsqldb/RangeVariable.java
diff --git a/src/org/hsqldb/RangeVariableJoined.java b/src/main/java/org/hsqldb/RangeVariableJoined.java
similarity index 100%
rename from src/org/hsqldb/RangeVariableJoined.java
rename to src/main/java/org/hsqldb/RangeVariableJoined.java
diff --git a/src/org/hsqldb/RangeVariableResolver.java b/src/main/java/org/hsqldb/RangeVariableResolver.java
similarity index 100%
rename from src/org/hsqldb/RangeVariableResolver.java
rename to src/main/java/org/hsqldb/RangeVariableResolver.java
diff --git a/src/org/hsqldb/ReferenceObject.java b/src/main/java/org/hsqldb/ReferenceObject.java
similarity index 100%
rename from src/org/hsqldb/ReferenceObject.java
rename to src/main/java/org/hsqldb/ReferenceObject.java
diff --git a/src/org/hsqldb/Routine.java b/src/main/java/org/hsqldb/Routine.java
similarity index 100%
rename from src/org/hsqldb/Routine.java
rename to src/main/java/org/hsqldb/Routine.java
diff --git a/src/org/hsqldb/RoutineSchema.java b/src/main/java/org/hsqldb/RoutineSchema.java
similarity index 100%
rename from src/org/hsqldb/RoutineSchema.java
rename to src/main/java/org/hsqldb/RoutineSchema.java
diff --git a/src/org/hsqldb/Row.java b/src/main/java/org/hsqldb/Row.java
similarity index 100%
rename from src/org/hsqldb/Row.java
rename to src/main/java/org/hsqldb/Row.java
diff --git a/src/org/hsqldb/RowAVL.java b/src/main/java/org/hsqldb/RowAVL.java
similarity index 100%
rename from src/org/hsqldb/RowAVL.java
rename to src/main/java/org/hsqldb/RowAVL.java
diff --git a/src/org/hsqldb/RowAVLDisk.java b/src/main/java/org/hsqldb/RowAVLDisk.java
similarity index 100%
rename from src/org/hsqldb/RowAVLDisk.java
rename to src/main/java/org/hsqldb/RowAVLDisk.java
diff --git a/src/org/hsqldb/RowAVLDiskData.java b/src/main/java/org/hsqldb/RowAVLDiskData.java
similarity index 100%
rename from src/org/hsqldb/RowAVLDiskData.java
rename to src/main/java/org/hsqldb/RowAVLDiskData.java
diff --git a/src/org/hsqldb/RowAVLDiskLarge.java b/src/main/java/org/hsqldb/RowAVLDiskLarge.java
similarity index 100%
rename from src/org/hsqldb/RowAVLDiskLarge.java
rename to src/main/java/org/hsqldb/RowAVLDiskLarge.java
diff --git a/src/org/hsqldb/RowAction.java b/src/main/java/org/hsqldb/RowAction.java
similarity index 100%
rename from src/org/hsqldb/RowAction.java
rename to src/main/java/org/hsqldb/RowAction.java
diff --git a/src/org/hsqldb/RowActionBase.java b/src/main/java/org/hsqldb/RowActionBase.java
similarity index 100%
rename from src/org/hsqldb/RowActionBase.java
rename to src/main/java/org/hsqldb/RowActionBase.java
diff --git a/src/org/hsqldb/RowDiskDataChange.java b/src/main/java/org/hsqldb/RowDiskDataChange.java
similarity index 100%
rename from src/org/hsqldb/RowDiskDataChange.java
rename to src/main/java/org/hsqldb/RowDiskDataChange.java
diff --git a/src/org/hsqldb/Scanner.java b/src/main/java/org/hsqldb/Scanner.java
similarity index 100%
rename from src/org/hsqldb/Scanner.java
rename to src/main/java/org/hsqldb/Scanner.java
diff --git a/src/org/hsqldb/Schema.java b/src/main/java/org/hsqldb/Schema.java
similarity index 100%
rename from src/org/hsqldb/Schema.java
rename to src/main/java/org/hsqldb/Schema.java
diff --git a/src/org/hsqldb/SchemaManager.java b/src/main/java/org/hsqldb/SchemaManager.java
similarity index 100%
rename from src/org/hsqldb/SchemaManager.java
rename to src/main/java/org/hsqldb/SchemaManager.java
diff --git a/src/org/hsqldb/SchemaObject.java b/src/main/java/org/hsqldb/SchemaObject.java
similarity index 100%
rename from src/org/hsqldb/SchemaObject.java
rename to src/main/java/org/hsqldb/SchemaObject.java
diff --git a/src/org/hsqldb/SchemaObjectSet.java b/src/main/java/org/hsqldb/SchemaObjectSet.java
similarity index 100%
rename from src/org/hsqldb/SchemaObjectSet.java
rename to src/main/java/org/hsqldb/SchemaObjectSet.java
diff --git a/src/org/hsqldb/Server.java b/src/main/java/org/hsqldb/Server.java
similarity index 100%
rename from src/org/hsqldb/Server.java
rename to src/main/java/org/hsqldb/Server.java
diff --git a/src/org/hsqldb/Session.java b/src/main/java/org/hsqldb/Session.java
similarity index 100%
rename from src/org/hsqldb/Session.java
rename to src/main/java/org/hsqldb/Session.java
diff --git a/src/org/hsqldb/SessionContext.java b/src/main/java/org/hsqldb/SessionContext.java
similarity index 100%
rename from src/org/hsqldb/SessionContext.java
rename to src/main/java/org/hsqldb/SessionContext.java
diff --git a/src/org/hsqldb/SessionData.java b/src/main/java/org/hsqldb/SessionData.java
similarity index 100%
rename from src/org/hsqldb/SessionData.java
rename to src/main/java/org/hsqldb/SessionData.java
diff --git a/src/org/hsqldb/SessionInterface.java b/src/main/java/org/hsqldb/SessionInterface.java
similarity index 100%
rename from src/org/hsqldb/SessionInterface.java
rename to src/main/java/org/hsqldb/SessionInterface.java
diff --git a/src/org/hsqldb/SessionManager.java b/src/main/java/org/hsqldb/SessionManager.java
similarity index 100%
rename from src/org/hsqldb/SessionManager.java
rename to src/main/java/org/hsqldb/SessionManager.java
diff --git a/src/org/hsqldb/SetFunction.java b/src/main/java/org/hsqldb/SetFunction.java
similarity index 100%
rename from src/org/hsqldb/SetFunction.java
rename to src/main/java/org/hsqldb/SetFunction.java
diff --git a/src/org/hsqldb/SortAndSlice.java b/src/main/java/org/hsqldb/SortAndSlice.java
similarity index 100%
rename from src/org/hsqldb/SortAndSlice.java
rename to src/main/java/org/hsqldb/SortAndSlice.java
diff --git a/src/org/hsqldb/SqlInvariants.java b/src/main/java/org/hsqldb/SqlInvariants.java
similarity index 100%
rename from src/org/hsqldb/SqlInvariants.java
rename to src/main/java/org/hsqldb/SqlInvariants.java
diff --git a/src/org/hsqldb/Statement.java b/src/main/java/org/hsqldb/Statement.java
similarity index 100%
rename from src/org/hsqldb/Statement.java
rename to src/main/java/org/hsqldb/Statement.java
diff --git a/src/org/hsqldb/StatementCommand.java b/src/main/java/org/hsqldb/StatementCommand.java
similarity index 100%
rename from src/org/hsqldb/StatementCommand.java
rename to src/main/java/org/hsqldb/StatementCommand.java
diff --git a/src/org/hsqldb/StatementCompound.java b/src/main/java/org/hsqldb/StatementCompound.java
similarity index 100%
rename from src/org/hsqldb/StatementCompound.java
rename to src/main/java/org/hsqldb/StatementCompound.java
diff --git a/src/org/hsqldb/StatementCursor.java b/src/main/java/org/hsqldb/StatementCursor.java
similarity index 100%
rename from src/org/hsqldb/StatementCursor.java
rename to src/main/java/org/hsqldb/StatementCursor.java
diff --git a/src/org/hsqldb/StatementDML.java b/src/main/java/org/hsqldb/StatementDML.java
similarity index 100%
rename from src/org/hsqldb/StatementDML.java
rename to src/main/java/org/hsqldb/StatementDML.java
diff --git a/src/org/hsqldb/StatementDMQL.java b/src/main/java/org/hsqldb/StatementDMQL.java
similarity index 100%
rename from src/org/hsqldb/StatementDMQL.java
rename to src/main/java/org/hsqldb/StatementDMQL.java
diff --git a/src/org/hsqldb/StatementExpression.java b/src/main/java/org/hsqldb/StatementExpression.java
similarity index 100%
rename from src/org/hsqldb/StatementExpression.java
rename to src/main/java/org/hsqldb/StatementExpression.java
diff --git a/src/org/hsqldb/StatementHandler.java b/src/main/java/org/hsqldb/StatementHandler.java
similarity index 100%
rename from src/org/hsqldb/StatementHandler.java
rename to src/main/java/org/hsqldb/StatementHandler.java
diff --git a/src/org/hsqldb/StatementInsert.java b/src/main/java/org/hsqldb/StatementInsert.java
similarity index 100%
rename from src/org/hsqldb/StatementInsert.java
rename to src/main/java/org/hsqldb/StatementInsert.java
diff --git a/src/org/hsqldb/StatementManager.java b/src/main/java/org/hsqldb/StatementManager.java
similarity index 100%
rename from src/org/hsqldb/StatementManager.java
rename to src/main/java/org/hsqldb/StatementManager.java
diff --git a/src/org/hsqldb/StatementProcedure.java b/src/main/java/org/hsqldb/StatementProcedure.java
similarity index 100%
rename from src/org/hsqldb/StatementProcedure.java
rename to src/main/java/org/hsqldb/StatementProcedure.java
diff --git a/src/org/hsqldb/StatementQuery.java b/src/main/java/org/hsqldb/StatementQuery.java
similarity index 100%
rename from src/org/hsqldb/StatementQuery.java
rename to src/main/java/org/hsqldb/StatementQuery.java
diff --git a/src/org/hsqldb/StatementResultUpdate.java b/src/main/java/org/hsqldb/StatementResultUpdate.java
similarity index 100%
rename from src/org/hsqldb/StatementResultUpdate.java
rename to src/main/java/org/hsqldb/StatementResultUpdate.java
diff --git a/src/org/hsqldb/StatementSchema.java b/src/main/java/org/hsqldb/StatementSchema.java
similarity index 100%
rename from src/org/hsqldb/StatementSchema.java
rename to src/main/java/org/hsqldb/StatementSchema.java
diff --git a/src/org/hsqldb/StatementSchemaDefinition.java b/src/main/java/org/hsqldb/StatementSchemaDefinition.java
similarity index 100%
rename from src/org/hsqldb/StatementSchemaDefinition.java
rename to src/main/java/org/hsqldb/StatementSchemaDefinition.java
diff --git a/src/org/hsqldb/StatementSession.java b/src/main/java/org/hsqldb/StatementSession.java
similarity index 100%
rename from src/org/hsqldb/StatementSession.java
rename to src/main/java/org/hsqldb/StatementSession.java
diff --git a/src/org/hsqldb/StatementSet.java b/src/main/java/org/hsqldb/StatementSet.java
similarity index 100%
rename from src/org/hsqldb/StatementSet.java
rename to src/main/java/org/hsqldb/StatementSet.java
diff --git a/src/org/hsqldb/StatementSignal.java b/src/main/java/org/hsqldb/StatementSignal.java
similarity index 100%
rename from src/org/hsqldb/StatementSignal.java
rename to src/main/java/org/hsqldb/StatementSignal.java
diff --git a/src/org/hsqldb/StatementSimple.java b/src/main/java/org/hsqldb/StatementSimple.java
similarity index 100%
rename from src/org/hsqldb/StatementSimple.java
rename to src/main/java/org/hsqldb/StatementSimple.java
diff --git a/src/org/hsqldb/StatementTypes.java b/src/main/java/org/hsqldb/StatementTypes.java
similarity index 100%
rename from src/org/hsqldb/StatementTypes.java
rename to src/main/java/org/hsqldb/StatementTypes.java
diff --git a/src/org/hsqldb/Table.java b/src/main/java/org/hsqldb/Table.java
similarity index 100%
rename from src/org/hsqldb/Table.java
rename to src/main/java/org/hsqldb/Table.java
diff --git a/src/org/hsqldb/TableBase.java b/src/main/java/org/hsqldb/TableBase.java
similarity index 100%
rename from src/org/hsqldb/TableBase.java
rename to src/main/java/org/hsqldb/TableBase.java
diff --git a/src/org/hsqldb/TableDerived.java b/src/main/java/org/hsqldb/TableDerived.java
similarity index 100%
rename from src/org/hsqldb/TableDerived.java
rename to src/main/java/org/hsqldb/TableDerived.java
diff --git a/src/org/hsqldb/TableUtil.java b/src/main/java/org/hsqldb/TableUtil.java
similarity index 100%
rename from src/org/hsqldb/TableUtil.java
rename to src/main/java/org/hsqldb/TableUtil.java
diff --git a/src/org/hsqldb/TableWorks.java b/src/main/java/org/hsqldb/TableWorks.java
similarity index 100%
rename from src/org/hsqldb/TableWorks.java
rename to src/main/java/org/hsqldb/TableWorks.java
diff --git a/src/org/hsqldb/TextTable.java b/src/main/java/org/hsqldb/TextTable.java
similarity index 100%
rename from src/org/hsqldb/TextTable.java
rename to src/main/java/org/hsqldb/TextTable.java
diff --git a/src/org/hsqldb/Token.java b/src/main/java/org/hsqldb/Token.java
similarity index 100%
rename from src/org/hsqldb/Token.java
rename to src/main/java/org/hsqldb/Token.java
diff --git a/src/org/hsqldb/Tokens.java b/src/main/java/org/hsqldb/Tokens.java
similarity index 100%
rename from src/org/hsqldb/Tokens.java
rename to src/main/java/org/hsqldb/Tokens.java
diff --git a/src/org/hsqldb/TransactionManager.java b/src/main/java/org/hsqldb/TransactionManager.java
similarity index 100%
rename from src/org/hsqldb/TransactionManager.java
rename to src/main/java/org/hsqldb/TransactionManager.java
diff --git a/src/org/hsqldb/TransactionManager2PL.java b/src/main/java/org/hsqldb/TransactionManager2PL.java
similarity index 100%
rename from src/org/hsqldb/TransactionManager2PL.java
rename to src/main/java/org/hsqldb/TransactionManager2PL.java
diff --git a/src/org/hsqldb/TransactionManagerCommon.java b/src/main/java/org/hsqldb/TransactionManagerCommon.java
similarity index 100%
rename from src/org/hsqldb/TransactionManagerCommon.java
rename to src/main/java/org/hsqldb/TransactionManagerCommon.java
diff --git a/src/org/hsqldb/TransactionManagerMV2PL.java b/src/main/java/org/hsqldb/TransactionManagerMV2PL.java
similarity index 100%
rename from src/org/hsqldb/TransactionManagerMV2PL.java
rename to src/main/java/org/hsqldb/TransactionManagerMV2PL.java
diff --git a/src/org/hsqldb/TransactionManagerMVCC.java b/src/main/java/org/hsqldb/TransactionManagerMVCC.java
similarity index 100%
rename from src/org/hsqldb/TransactionManagerMVCC.java
rename to src/main/java/org/hsqldb/TransactionManagerMVCC.java
diff --git a/src/org/hsqldb/Trigger.java b/src/main/java/org/hsqldb/Trigger.java
similarity index 100%
rename from src/org/hsqldb/Trigger.java
rename to src/main/java/org/hsqldb/Trigger.java
diff --git a/src/org/hsqldb/TriggerDef.java b/src/main/java/org/hsqldb/TriggerDef.java
similarity index 100%
rename from src/org/hsqldb/TriggerDef.java
rename to src/main/java/org/hsqldb/TriggerDef.java
diff --git a/src/org/hsqldb/TriggerDefSQL.java b/src/main/java/org/hsqldb/TriggerDefSQL.java
similarity index 100%
rename from src/org/hsqldb/TriggerDefSQL.java
rename to src/main/java/org/hsqldb/TriggerDefSQL.java
diff --git a/src/org/hsqldb/TypeInvariants.java b/src/main/java/org/hsqldb/TypeInvariants.java
similarity index 100%
rename from src/org/hsqldb/TypeInvariants.java
rename to src/main/java/org/hsqldb/TypeInvariants.java
diff --git a/src/org/hsqldb/View.java b/src/main/java/org/hsqldb/View.java
similarity index 100%
rename from src/org/hsqldb/View.java
rename to src/main/java/org/hsqldb/View.java
diff --git a/src/org/hsqldb/auth/AuthBeanMultiplexer.java b/src/main/java/org/hsqldb/auth/AuthBeanMultiplexer.java
similarity index 100%
rename from src/org/hsqldb/auth/AuthBeanMultiplexer.java
rename to src/main/java/org/hsqldb/auth/AuthBeanMultiplexer.java
diff --git a/src/org/hsqldb/auth/AuthFunctionBean.java b/src/main/java/org/hsqldb/auth/AuthFunctionBean.java
similarity index 100%
rename from src/org/hsqldb/auth/AuthFunctionBean.java
rename to src/main/java/org/hsqldb/auth/AuthFunctionBean.java
diff --git a/src/org/hsqldb/auth/AuthUtils.java b/src/main/java/org/hsqldb/auth/AuthUtils.java
similarity index 100%
rename from src/org/hsqldb/auth/AuthUtils.java
rename to src/main/java/org/hsqldb/auth/AuthUtils.java
diff --git a/src/org/hsqldb/auth/DenyException.java b/src/main/java/org/hsqldb/auth/DenyException.java
similarity index 100%
rename from src/org/hsqldb/auth/DenyException.java
rename to src/main/java/org/hsqldb/auth/DenyException.java
diff --git a/src/org/hsqldb/auth/HsqldbSlaveAuthBean.java b/src/main/java/org/hsqldb/auth/HsqldbSlaveAuthBean.java
similarity index 100%
rename from src/org/hsqldb/auth/HsqldbSlaveAuthBean.java
rename to src/main/java/org/hsqldb/auth/HsqldbSlaveAuthBean.java
diff --git a/src/org/hsqldb/auth/JaasAuthBean.java b/src/main/java/org/hsqldb/auth/JaasAuthBean.java
similarity index 100%
rename from src/org/hsqldb/auth/JaasAuthBean.java
rename to src/main/java/org/hsqldb/auth/JaasAuthBean.java
diff --git a/src/org/hsqldb/auth/LdapAuthBean.java b/src/main/java/org/hsqldb/auth/LdapAuthBean.java
similarity index 100%
rename from src/org/hsqldb/auth/LdapAuthBean.java
rename to src/main/java/org/hsqldb/auth/LdapAuthBean.java
diff --git a/src/org/hsqldb/auth/LdapAuthBeanTester.java b/src/main/java/org/hsqldb/auth/LdapAuthBeanTester.java
similarity index 100%
rename from src/org/hsqldb/auth/LdapAuthBeanTester.java
rename to src/main/java/org/hsqldb/auth/LdapAuthBeanTester.java
diff --git a/src/org/hsqldb/cmdline/SqlFile.java b/src/main/java/org/hsqldb/cmdline/SqlFile.java
similarity index 100%
rename from src/org/hsqldb/cmdline/SqlFile.java
rename to src/main/java/org/hsqldb/cmdline/SqlFile.java
diff --git a/src/org/hsqldb/cmdline/SqlTool.java b/src/main/java/org/hsqldb/cmdline/SqlTool.java
similarity index 100%
rename from src/org/hsqldb/cmdline/SqlTool.java
rename to src/main/java/org/hsqldb/cmdline/SqlTool.java
diff --git a/src/org/hsqldb/cmdline/SqlToolError.java b/src/main/java/org/hsqldb/cmdline/SqlToolError.java
similarity index 100%
rename from src/org/hsqldb/cmdline/SqlToolError.java
rename to src/main/java/org/hsqldb/cmdline/SqlToolError.java
diff --git a/src/org/hsqldb/cmdline/SqlToolSprayer.java b/src/main/java/org/hsqldb/cmdline/SqlToolSprayer.java
similarity index 100%
rename from src/org/hsqldb/cmdline/SqlToolSprayer.java
rename to src/main/java/org/hsqldb/cmdline/SqlToolSprayer.java
diff --git a/src/org/hsqldb/cmdline/SqltoolRB.java b/src/main/java/org/hsqldb/cmdline/SqltoolRB.java
similarity index 100%
rename from src/org/hsqldb/cmdline/SqltoolRB.java
rename to src/main/java/org/hsqldb/cmdline/SqltoolRB.java
diff --git a/src/org/hsqldb/cmdline/sqltool.flex b/src/main/java/org/hsqldb/cmdline/sqltool.flex
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool.flex
rename to src/main/java/org/hsqldb/cmdline/sqltool.flex
diff --git a/src/org/hsqldb/cmdline/sqltool.properties b/src/main/java/org/hsqldb/cmdline/sqltool.properties
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool.properties
rename to src/main/java/org/hsqldb/cmdline/sqltool.properties
diff --git a/src/org/hsqldb/cmdline/sqltool/Calculator.java b/src/main/java/org/hsqldb/cmdline/sqltool/Calculator.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/Calculator.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/Calculator.java
diff --git a/src/org/hsqldb/cmdline/sqltool/FileRecordReader.java b/src/main/java/org/hsqldb/cmdline/sqltool/FileRecordReader.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/FileRecordReader.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/FileRecordReader.java
diff --git a/src/org/hsqldb/cmdline/sqltool/SqlFile.banner.text b/src/main/java/org/hsqldb/cmdline/sqltool/SqlFile.banner.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/SqlFile.banner.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/SqlFile.banner.text
diff --git a/src/org/hsqldb/cmdline/sqltool/SqlFile.banner_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/SqlFile.banner_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/SqlFile.banner_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/SqlFile.banner_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/SqlFileScanner.java b/src/main/java/org/hsqldb/cmdline/sqltool/SqlFileScanner.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/SqlFileScanner.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/SqlFileScanner.java
diff --git a/src/org/hsqldb/cmdline/sqltool/SqlTool.syntax.text b/src/main/java/org/hsqldb/cmdline/sqltool/SqlTool.syntax.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/SqlTool.syntax.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/SqlTool.syntax.text
diff --git a/src/org/hsqldb/cmdline/sqltool/SqlTool.syntax_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/SqlTool.syntax_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/SqlTool.syntax_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/SqlTool.syntax_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/Token.java b/src/main/java/org/hsqldb/cmdline/sqltool/Token.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/Token.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/Token.java
diff --git a/src/org/hsqldb/cmdline/sqltool/TokenList.java b/src/main/java/org/hsqldb/cmdline/sqltool/TokenList.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/TokenList.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/TokenList.java
diff --git a/src/org/hsqldb/cmdline/sqltool/TokenSource.java b/src/main/java/org/hsqldb/cmdline/sqltool/TokenSource.java
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/TokenSource.java
rename to src/main/java/org/hsqldb/cmdline/sqltool/TokenSource.java
diff --git a/src/org/hsqldb/cmdline/sqltool/buffer.help.text b/src/main/java/org/hsqldb/cmdline/sqltool/buffer.help.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/buffer.help.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/buffer.help.text
diff --git a/src/org/hsqldb/cmdline/sqltool/buffer.help_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/buffer.help_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/buffer.help_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/buffer.help_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/d.options.text b/src/main/java/org/hsqldb/cmdline/sqltool/d.options.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/d.options.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/d.options.text
diff --git a/src/org/hsqldb/cmdline/sqltool/d.options_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/d.options_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/d.options_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/d.options_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/dsv.options.text b/src/main/java/org/hsqldb/cmdline/sqltool/dsv.options.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/dsv.options.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/dsv.options.text
diff --git a/src/org/hsqldb/cmdline/sqltool/dsv.options_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/dsv.options_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/dsv.options_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/dsv.options_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/errorat.text b/src/main/java/org/hsqldb/cmdline/sqltool/errorat.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/errorat.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/errorat.text
diff --git a/src/org/hsqldb/cmdline/sqltool/errorat_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/errorat_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/errorat_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/errorat_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/macro.help.text b/src/main/java/org/hsqldb/cmdline/sqltool/macro.help.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/macro.help.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/macro.help.text
diff --git a/src/org/hsqldb/cmdline/sqltool/macro.help_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/macro.help_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/macro.help_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/macro.help_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/pl.assign.text b/src/main/java/org/hsqldb/cmdline/sqltool/pl.assign.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/pl.assign.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/pl.assign.text
diff --git a/src/org/hsqldb/cmdline/sqltool/pl.control.text b/src/main/java/org/hsqldb/cmdline/sqltool/pl.control.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/pl.control.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/pl.control.text
diff --git a/src/org/hsqldb/cmdline/sqltool/pl.help.text b/src/main/java/org/hsqldb/cmdline/sqltool/pl.help.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/pl.help.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/pl.help.text
diff --git a/src/org/hsqldb/cmdline/sqltool/pl.help_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/pl.help_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/pl.help_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/pl.help_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/raw.leadin.text b/src/main/java/org/hsqldb/cmdline/sqltool/raw.leadin.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/raw.leadin.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/raw.leadin.text
diff --git a/src/org/hsqldb/cmdline/sqltool/raw.leadin_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/raw.leadin_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/raw.leadin_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/raw.leadin_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/rejectreport.bottom.text b/src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.bottom.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/rejectreport.bottom.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.bottom.text
diff --git a/src/org/hsqldb/cmdline/sqltool/rejectreport.bottom_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.bottom_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/rejectreport.bottom_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.bottom_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/rejectreport.row.text b/src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.row.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/rejectreport.row.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.row.text
diff --git a/src/org/hsqldb/cmdline/sqltool/rejectreport.top.text b/src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.top.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/rejectreport.top.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.top.text
diff --git a/src/org/hsqldb/cmdline/sqltool/rejectreport.top_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.top_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/rejectreport.top_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/rejectreport.top_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool/special.help.text b/src/main/java/org/hsqldb/cmdline/sqltool/special.help.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/special.help.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/special.help.text
diff --git a/src/org/hsqldb/cmdline/sqltool/special.help_de.text b/src/main/java/org/hsqldb/cmdline/sqltool/special.help_de.text
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool/special.help_de.text
rename to src/main/java/org/hsqldb/cmdline/sqltool/special.help_de.text
diff --git a/src/org/hsqldb/cmdline/sqltool_de.properties b/src/main/java/org/hsqldb/cmdline/sqltool_de.properties
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool_de.properties
rename to src/main/java/org/hsqldb/cmdline/sqltool_de.properties
diff --git a/src/org/hsqldb/cmdline/sqltool_nl.properties b/src/main/java/org/hsqldb/cmdline/sqltool_nl.properties
similarity index 100%
rename from src/org/hsqldb/cmdline/sqltool_nl.properties
rename to src/main/java/org/hsqldb/cmdline/sqltool_nl.properties
diff --git a/src/org/hsqldb/dbinfo/DITableInfo.java b/src/main/java/org/hsqldb/dbinfo/DITableInfo.java
similarity index 100%
rename from src/org/hsqldb/dbinfo/DITableInfo.java
rename to src/main/java/org/hsqldb/dbinfo/DITableInfo.java
diff --git a/src/org/hsqldb/dbinfo/DatabaseInformation.java b/src/main/java/org/hsqldb/dbinfo/DatabaseInformation.java
similarity index 100%
rename from src/org/hsqldb/dbinfo/DatabaseInformation.java
rename to src/main/java/org/hsqldb/dbinfo/DatabaseInformation.java
diff --git a/src/org/hsqldb/dbinfo/DatabaseInformationFull.java b/src/main/java/org/hsqldb/dbinfo/DatabaseInformationFull.java
similarity index 100%
rename from src/org/hsqldb/dbinfo/DatabaseInformationFull.java
rename to src/main/java/org/hsqldb/dbinfo/DatabaseInformationFull.java
diff --git a/src/org/hsqldb/dbinfo/DatabaseInformationMain.java b/src/main/java/org/hsqldb/dbinfo/DatabaseInformationMain.java
similarity index 100%
rename from src/org/hsqldb/dbinfo/DatabaseInformationMain.java
rename to src/main/java/org/hsqldb/dbinfo/DatabaseInformationMain.java
diff --git a/src/org/hsqldb/error/Error.java b/src/main/java/org/hsqldb/error/Error.java
similarity index 100%
rename from src/org/hsqldb/error/Error.java
rename to src/main/java/org/hsqldb/error/Error.java
diff --git a/src/org/hsqldb/error/ErrorCode.java b/src/main/java/org/hsqldb/error/ErrorCode.java
similarity index 100%
rename from src/org/hsqldb/error/ErrorCode.java
rename to src/main/java/org/hsqldb/error/ErrorCode.java
diff --git a/src/org/hsqldb/index/Index.java b/src/main/java/org/hsqldb/index/Index.java
similarity index 100%
rename from src/org/hsqldb/index/Index.java
rename to src/main/java/org/hsqldb/index/Index.java
diff --git a/src/org/hsqldb/index/IndexAVL.java b/src/main/java/org/hsqldb/index/IndexAVL.java
similarity index 100%
rename from src/org/hsqldb/index/IndexAVL.java
rename to src/main/java/org/hsqldb/index/IndexAVL.java
diff --git a/src/org/hsqldb/index/IndexAVLMemory.java b/src/main/java/org/hsqldb/index/IndexAVLMemory.java
similarity index 100%
rename from src/org/hsqldb/index/IndexAVLMemory.java
rename to src/main/java/org/hsqldb/index/IndexAVLMemory.java
diff --git a/src/org/hsqldb/index/NodeAVL.java b/src/main/java/org/hsqldb/index/NodeAVL.java
similarity index 100%
rename from src/org/hsqldb/index/NodeAVL.java
rename to src/main/java/org/hsqldb/index/NodeAVL.java
diff --git a/src/org/hsqldb/index/NodeAVLDisk.java b/src/main/java/org/hsqldb/index/NodeAVLDisk.java
similarity index 100%
rename from src/org/hsqldb/index/NodeAVLDisk.java
rename to src/main/java/org/hsqldb/index/NodeAVLDisk.java
diff --git a/src/org/hsqldb/index/NodeAVLDiskLarge.java b/src/main/java/org/hsqldb/index/NodeAVLDiskLarge.java
similarity index 100%
rename from src/org/hsqldb/index/NodeAVLDiskLarge.java
rename to src/main/java/org/hsqldb/index/NodeAVLDiskLarge.java
diff --git a/src/org/hsqldb/jdbc/JDBCArray.java b/src/main/java/org/hsqldb/jdbc/JDBCArray.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCArray.java
rename to src/main/java/org/hsqldb/jdbc/JDBCArray.java
diff --git a/src/org/hsqldb/jdbc/JDBCArrayBasic.java b/src/main/java/org/hsqldb/jdbc/JDBCArrayBasic.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCArrayBasic.java
rename to src/main/java/org/hsqldb/jdbc/JDBCArrayBasic.java
diff --git a/src/org/hsqldb/jdbc/JDBCBlob.java b/src/main/java/org/hsqldb/jdbc/JDBCBlob.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCBlob.java
rename to src/main/java/org/hsqldb/jdbc/JDBCBlob.java
diff --git a/src/org/hsqldb/jdbc/JDBCBlobClient.java b/src/main/java/org/hsqldb/jdbc/JDBCBlobClient.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCBlobClient.java
rename to src/main/java/org/hsqldb/jdbc/JDBCBlobClient.java
diff --git a/src/org/hsqldb/jdbc/JDBCBlobFile.java b/src/main/java/org/hsqldb/jdbc/JDBCBlobFile.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCBlobFile.java
rename to src/main/java/org/hsqldb/jdbc/JDBCBlobFile.java
diff --git a/src/org/hsqldb/jdbc/JDBCCallableStatement.java b/src/main/java/org/hsqldb/jdbc/JDBCCallableStatement.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCCallableStatement.java
rename to src/main/java/org/hsqldb/jdbc/JDBCCallableStatement.java
diff --git a/src/org/hsqldb/jdbc/JDBCClob.java b/src/main/java/org/hsqldb/jdbc/JDBCClob.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCClob.java
rename to src/main/java/org/hsqldb/jdbc/JDBCClob.java
diff --git a/src/org/hsqldb/jdbc/JDBCClobClient.java b/src/main/java/org/hsqldb/jdbc/JDBCClobClient.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCClobClient.java
rename to src/main/java/org/hsqldb/jdbc/JDBCClobClient.java
diff --git a/src/org/hsqldb/jdbc/JDBCClobFile.java b/src/main/java/org/hsqldb/jdbc/JDBCClobFile.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCClobFile.java
rename to src/main/java/org/hsqldb/jdbc/JDBCClobFile.java
diff --git a/src/org/hsqldb/jdbc/JDBCColumnMetaData.java b/src/main/java/org/hsqldb/jdbc/JDBCColumnMetaData.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCColumnMetaData.java
rename to src/main/java/org/hsqldb/jdbc/JDBCColumnMetaData.java
diff --git a/src/org/hsqldb/jdbc/JDBCCommonDataSource.java b/src/main/java/org/hsqldb/jdbc/JDBCCommonDataSource.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCCommonDataSource.java
rename to src/main/java/org/hsqldb/jdbc/JDBCCommonDataSource.java
diff --git a/src/org/hsqldb/jdbc/JDBCConnection.java b/src/main/java/org/hsqldb/jdbc/JDBCConnection.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCConnection.java
rename to src/main/java/org/hsqldb/jdbc/JDBCConnection.java
diff --git a/src/org/hsqldb/jdbc/JDBCConnectionEventListener.java b/src/main/java/org/hsqldb/jdbc/JDBCConnectionEventListener.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCConnectionEventListener.java
rename to src/main/java/org/hsqldb/jdbc/JDBCConnectionEventListener.java
diff --git a/src/org/hsqldb/jdbc/JDBCDataSource.java b/src/main/java/org/hsqldb/jdbc/JDBCDataSource.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCDataSource.java
rename to src/main/java/org/hsqldb/jdbc/JDBCDataSource.java
diff --git a/src/org/hsqldb/jdbc/JDBCDataSourceFactory.java b/src/main/java/org/hsqldb/jdbc/JDBCDataSourceFactory.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCDataSourceFactory.java
rename to src/main/java/org/hsqldb/jdbc/JDBCDataSourceFactory.java
diff --git a/src/org/hsqldb/jdbc/JDBCDatabaseMetaData.java b/src/main/java/org/hsqldb/jdbc/JDBCDatabaseMetaData.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCDatabaseMetaData.java
rename to src/main/java/org/hsqldb/jdbc/JDBCDatabaseMetaData.java
diff --git a/src/org/hsqldb/jdbc/JDBCDriver.java b/src/main/java/org/hsqldb/jdbc/JDBCDriver.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCDriver.java
rename to src/main/java/org/hsqldb/jdbc/JDBCDriver.java
diff --git a/src/org/hsqldb/jdbc/JDBCNClob.java b/src/main/java/org/hsqldb/jdbc/JDBCNClob.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCNClob.java
rename to src/main/java/org/hsqldb/jdbc/JDBCNClob.java
diff --git a/src/org/hsqldb/jdbc/JDBCParameterMetaData.java b/src/main/java/org/hsqldb/jdbc/JDBCParameterMetaData.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCParameterMetaData.java
rename to src/main/java/org/hsqldb/jdbc/JDBCParameterMetaData.java
diff --git a/src/org/hsqldb/jdbc/JDBCPool.java b/src/main/java/org/hsqldb/jdbc/JDBCPool.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCPool.java
rename to src/main/java/org/hsqldb/jdbc/JDBCPool.java
diff --git a/src/org/hsqldb/jdbc/JDBCPreparedStatement.java b/src/main/java/org/hsqldb/jdbc/JDBCPreparedStatement.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCPreparedStatement.java
rename to src/main/java/org/hsqldb/jdbc/JDBCPreparedStatement.java
diff --git a/src/org/hsqldb/jdbc/JDBCResultSet.java b/src/main/java/org/hsqldb/jdbc/JDBCResultSet.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCResultSet.java
rename to src/main/java/org/hsqldb/jdbc/JDBCResultSet.java
diff --git a/src/org/hsqldb/jdbc/JDBCResultSetMetaData.java b/src/main/java/org/hsqldb/jdbc/JDBCResultSetMetaData.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCResultSetMetaData.java
rename to src/main/java/org/hsqldb/jdbc/JDBCResultSetMetaData.java
diff --git a/src/org/hsqldb/jdbc/JDBCRowId.java b/src/main/java/org/hsqldb/jdbc/JDBCRowId.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCRowId.java
rename to src/main/java/org/hsqldb/jdbc/JDBCRowId.java
diff --git a/src/org/hsqldb/jdbc/JDBCSQLXML.java b/src/main/java/org/hsqldb/jdbc/JDBCSQLXML.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCSQLXML.java
rename to src/main/java/org/hsqldb/jdbc/JDBCSQLXML.java
diff --git a/src/org/hsqldb/jdbc/JDBCSavepoint.java b/src/main/java/org/hsqldb/jdbc/JDBCSavepoint.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCSavepoint.java
rename to src/main/java/org/hsqldb/jdbc/JDBCSavepoint.java
diff --git a/src/org/hsqldb/jdbc/JDBCStatement.java b/src/main/java/org/hsqldb/jdbc/JDBCStatement.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCStatement.java
rename to src/main/java/org/hsqldb/jdbc/JDBCStatement.java
diff --git a/src/org/hsqldb/jdbc/JDBCStatementBase.java b/src/main/java/org/hsqldb/jdbc/JDBCStatementBase.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCStatementBase.java
rename to src/main/java/org/hsqldb/jdbc/JDBCStatementBase.java
diff --git a/src/org/hsqldb/jdbc/JDBCUtil.java b/src/main/java/org/hsqldb/jdbc/JDBCUtil.java
similarity index 100%
rename from src/org/hsqldb/jdbc/JDBCUtil.java
rename to src/main/java/org/hsqldb/jdbc/JDBCUtil.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCPooledConnection.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCPooledConnection.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCPooledConnection.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCPooledConnection.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCPooledDataSource.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCPooledDataSource.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCPooledDataSource.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCPooledDataSource.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCXAConnection.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCXAConnection.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCXAConnection.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCXAConnection.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCXAConnectionWrapper.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCXADataSource.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCXADataSource.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCXADataSource.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCXADataSource.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCXAResource.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCXAResource.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCXAResource.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCXAResource.java
diff --git a/src/org/hsqldb/jdbc/pool/JDBCXID.java b/src/main/java/org/hsqldb/jdbc/pool/JDBCXID.java
similarity index 100%
rename from src/org/hsqldb/jdbc/pool/JDBCXID.java
rename to src/main/java/org/hsqldb/jdbc/pool/JDBCXID.java
diff --git a/src/org/hsqldb/jdbcDriver.java b/src/main/java/org/hsqldb/jdbcDriver.java
similarity index 100%
rename from src/org/hsqldb/jdbcDriver.java
rename to src/main/java/org/hsqldb/jdbcDriver.java
diff --git a/src/org/hsqldb/lib/AppendableException.java b/src/main/java/org/hsqldb/lib/AppendableException.java
similarity index 100%
rename from src/org/hsqldb/lib/AppendableException.java
rename to src/main/java/org/hsqldb/lib/AppendableException.java
diff --git a/src/org/hsqldb/lib/ArrayCounter.java b/src/main/java/org/hsqldb/lib/ArrayCounter.java
similarity index 100%
rename from src/org/hsqldb/lib/ArrayCounter.java
rename to src/main/java/org/hsqldb/lib/ArrayCounter.java
diff --git a/src/org/hsqldb/lib/ArrayListIdentity.java b/src/main/java/org/hsqldb/lib/ArrayListIdentity.java
similarity index 100%
rename from src/org/hsqldb/lib/ArrayListIdentity.java
rename to src/main/java/org/hsqldb/lib/ArrayListIdentity.java
diff --git a/src/org/hsqldb/lib/ArraySort.java b/src/main/java/org/hsqldb/lib/ArraySort.java
similarity index 100%
rename from src/org/hsqldb/lib/ArraySort.java
rename to src/main/java/org/hsqldb/lib/ArraySort.java
diff --git a/src/org/hsqldb/lib/ArrayUtil.java b/src/main/java/org/hsqldb/lib/ArrayUtil.java
similarity index 100%
rename from src/org/hsqldb/lib/ArrayUtil.java
rename to src/main/java/org/hsqldb/lib/ArrayUtil.java
diff --git a/src/org/hsqldb/lib/BaseList.java b/src/main/java/org/hsqldb/lib/BaseList.java
similarity index 100%
rename from src/org/hsqldb/lib/BaseList.java
rename to src/main/java/org/hsqldb/lib/BaseList.java
diff --git a/src/org/hsqldb/lib/BasicTextJdkLogFormatter.java b/src/main/java/org/hsqldb/lib/BasicTextJdkLogFormatter.java
similarity index 100%
rename from src/org/hsqldb/lib/BasicTextJdkLogFormatter.java
rename to src/main/java/org/hsqldb/lib/BasicTextJdkLogFormatter.java
diff --git a/src/org/hsqldb/lib/CharArrayWriter.java b/src/main/java/org/hsqldb/lib/CharArrayWriter.java
similarity index 100%
rename from src/org/hsqldb/lib/CharArrayWriter.java
rename to src/main/java/org/hsqldb/lib/CharArrayWriter.java
diff --git a/src/org/hsqldb/lib/ClosableByteArrayOutputStream.java b/src/main/java/org/hsqldb/lib/ClosableByteArrayOutputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/ClosableByteArrayOutputStream.java
rename to src/main/java/org/hsqldb/lib/ClosableByteArrayOutputStream.java
diff --git a/src/org/hsqldb/lib/ClosableCharArrayWriter.java b/src/main/java/org/hsqldb/lib/ClosableCharArrayWriter.java
similarity index 100%
rename from src/org/hsqldb/lib/ClosableCharArrayWriter.java
rename to src/main/java/org/hsqldb/lib/ClosableCharArrayWriter.java
diff --git a/src/org/hsqldb/lib/Collection.java b/src/main/java/org/hsqldb/lib/Collection.java
similarity index 100%
rename from src/org/hsqldb/lib/Collection.java
rename to src/main/java/org/hsqldb/lib/Collection.java
diff --git a/src/org/hsqldb/lib/CountUpDownLatch.java b/src/main/java/org/hsqldb/lib/CountUpDownLatch.java
similarity index 100%
rename from src/org/hsqldb/lib/CountUpDownLatch.java
rename to src/main/java/org/hsqldb/lib/CountUpDownLatch.java
diff --git a/src/org/hsqldb/lib/CountdownInputStream.java b/src/main/java/org/hsqldb/lib/CountdownInputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/CountdownInputStream.java
rename to src/main/java/org/hsqldb/lib/CountdownInputStream.java
diff --git a/src/org/hsqldb/lib/DataOutputStream.java b/src/main/java/org/hsqldb/lib/DataOutputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/DataOutputStream.java
rename to src/main/java/org/hsqldb/lib/DataOutputStream.java
diff --git a/src/org/hsqldb/lib/DoubleIntIndex.java b/src/main/java/org/hsqldb/lib/DoubleIntIndex.java
similarity index 100%
rename from src/org/hsqldb/lib/DoubleIntIndex.java
rename to src/main/java/org/hsqldb/lib/DoubleIntIndex.java
diff --git a/src/org/hsqldb/lib/FileAccess.java b/src/main/java/org/hsqldb/lib/FileAccess.java
similarity index 100%
rename from src/org/hsqldb/lib/FileAccess.java
rename to src/main/java/org/hsqldb/lib/FileAccess.java
diff --git a/src/org/hsqldb/lib/FileArchiver.java b/src/main/java/org/hsqldb/lib/FileArchiver.java
similarity index 100%
rename from src/org/hsqldb/lib/FileArchiver.java
rename to src/main/java/org/hsqldb/lib/FileArchiver.java
diff --git a/src/org/hsqldb/lib/FileUtil.java b/src/main/java/org/hsqldb/lib/FileUtil.java
similarity index 100%
rename from src/org/hsqldb/lib/FileUtil.java
rename to src/main/java/org/hsqldb/lib/FileUtil.java
diff --git a/src/org/hsqldb/lib/FrameworkLogger.java b/src/main/java/org/hsqldb/lib/FrameworkLogger.java
similarity index 100%
rename from src/org/hsqldb/lib/FrameworkLogger.java
rename to src/main/java/org/hsqldb/lib/FrameworkLogger.java
diff --git a/src/org/hsqldb/lib/HashMap.java b/src/main/java/org/hsqldb/lib/HashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/HashMap.java
rename to src/main/java/org/hsqldb/lib/HashMap.java
diff --git a/src/org/hsqldb/lib/HashMappedList.java b/src/main/java/org/hsqldb/lib/HashMappedList.java
similarity index 100%
rename from src/org/hsqldb/lib/HashMappedList.java
rename to src/main/java/org/hsqldb/lib/HashMappedList.java
diff --git a/src/org/hsqldb/lib/HashSet.java b/src/main/java/org/hsqldb/lib/HashSet.java
similarity index 100%
rename from src/org/hsqldb/lib/HashSet.java
rename to src/main/java/org/hsqldb/lib/HashSet.java
diff --git a/src/org/hsqldb/lib/HsqlArrayHeap.java b/src/main/java/org/hsqldb/lib/HsqlArrayHeap.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlArrayHeap.java
rename to src/main/java/org/hsqldb/lib/HsqlArrayHeap.java
diff --git a/src/org/hsqldb/lib/HsqlArrayList.java b/src/main/java/org/hsqldb/lib/HsqlArrayList.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlArrayList.java
rename to src/main/java/org/hsqldb/lib/HsqlArrayList.java
diff --git a/src/org/hsqldb/lib/HsqlByteArrayInputStream.java b/src/main/java/org/hsqldb/lib/HsqlByteArrayInputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlByteArrayInputStream.java
rename to src/main/java/org/hsqldb/lib/HsqlByteArrayInputStream.java
diff --git a/src/org/hsqldb/lib/HsqlByteArrayOutputStream.java b/src/main/java/org/hsqldb/lib/HsqlByteArrayOutputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlByteArrayOutputStream.java
rename to src/main/java/org/hsqldb/lib/HsqlByteArrayOutputStream.java
diff --git a/src/org/hsqldb/lib/HsqlDeque.java b/src/main/java/org/hsqldb/lib/HsqlDeque.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlDeque.java
rename to src/main/java/org/hsqldb/lib/HsqlDeque.java
diff --git a/src/org/hsqldb/lib/HsqlHeap.java b/src/main/java/org/hsqldb/lib/HsqlHeap.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlHeap.java
rename to src/main/java/org/hsqldb/lib/HsqlHeap.java
diff --git a/src/org/hsqldb/lib/HsqlList.java b/src/main/java/org/hsqldb/lib/HsqlList.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlList.java
rename to src/main/java/org/hsqldb/lib/HsqlList.java
diff --git a/src/org/hsqldb/lib/HsqlTaskQueue.java b/src/main/java/org/hsqldb/lib/HsqlTaskQueue.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlTaskQueue.java
rename to src/main/java/org/hsqldb/lib/HsqlTaskQueue.java
diff --git a/src/org/hsqldb/lib/HsqlThreadFactory.java b/src/main/java/org/hsqldb/lib/HsqlThreadFactory.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlThreadFactory.java
rename to src/main/java/org/hsqldb/lib/HsqlThreadFactory.java
diff --git a/src/org/hsqldb/lib/HsqlTimer.java b/src/main/java/org/hsqldb/lib/HsqlTimer.java
similarity index 100%
rename from src/org/hsqldb/lib/HsqlTimer.java
rename to src/main/java/org/hsqldb/lib/HsqlTimer.java
diff --git a/src/org/hsqldb/lib/InOutUtil.java b/src/main/java/org/hsqldb/lib/InOutUtil.java
similarity index 100%
rename from src/org/hsqldb/lib/InOutUtil.java
rename to src/main/java/org/hsqldb/lib/InOutUtil.java
diff --git a/src/org/hsqldb/lib/InputStreamInterface.java b/src/main/java/org/hsqldb/lib/InputStreamInterface.java
similarity index 100%
rename from src/org/hsqldb/lib/InputStreamInterface.java
rename to src/main/java/org/hsqldb/lib/InputStreamInterface.java
diff --git a/src/org/hsqldb/lib/InputStreamWrapper.java b/src/main/java/org/hsqldb/lib/InputStreamWrapper.java
similarity index 100%
rename from src/org/hsqldb/lib/InputStreamWrapper.java
rename to src/main/java/org/hsqldb/lib/InputStreamWrapper.java
diff --git a/src/org/hsqldb/lib/IntIndex.java b/src/main/java/org/hsqldb/lib/IntIndex.java
similarity index 100%
rename from src/org/hsqldb/lib/IntIndex.java
rename to src/main/java/org/hsqldb/lib/IntIndex.java
diff --git a/src/org/hsqldb/lib/IntKeyHashMap.java b/src/main/java/org/hsqldb/lib/IntKeyHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/IntKeyHashMap.java
rename to src/main/java/org/hsqldb/lib/IntKeyHashMap.java
diff --git a/src/org/hsqldb/lib/IntKeyHashMapConcurrent.java b/src/main/java/org/hsqldb/lib/IntKeyHashMapConcurrent.java
similarity index 100%
rename from src/org/hsqldb/lib/IntKeyHashMapConcurrent.java
rename to src/main/java/org/hsqldb/lib/IntKeyHashMapConcurrent.java
diff --git a/src/org/hsqldb/lib/IntKeyIntValueHashMap.java b/src/main/java/org/hsqldb/lib/IntKeyIntValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/IntKeyIntValueHashMap.java
rename to src/main/java/org/hsqldb/lib/IntKeyIntValueHashMap.java
diff --git a/src/org/hsqldb/lib/IntKeyLongValueHashMap.java b/src/main/java/org/hsqldb/lib/IntKeyLongValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/IntKeyLongValueHashMap.java
rename to src/main/java/org/hsqldb/lib/IntKeyLongValueHashMap.java
diff --git a/src/org/hsqldb/lib/IntLookup.java b/src/main/java/org/hsqldb/lib/IntLookup.java
similarity index 100%
rename from src/org/hsqldb/lib/IntLookup.java
rename to src/main/java/org/hsqldb/lib/IntLookup.java
diff --git a/src/org/hsqldb/lib/IntValueHashMap.java b/src/main/java/org/hsqldb/lib/IntValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/IntValueHashMap.java
rename to src/main/java/org/hsqldb/lib/IntValueHashMap.java
diff --git a/src/org/hsqldb/lib/Iterator.java b/src/main/java/org/hsqldb/lib/Iterator.java
similarity index 100%
rename from src/org/hsqldb/lib/Iterator.java
rename to src/main/java/org/hsqldb/lib/Iterator.java
diff --git a/src/org/hsqldb/lib/KMPSearchAlgorithm.java b/src/main/java/org/hsqldb/lib/KMPSearchAlgorithm.java
similarity index 100%
rename from src/org/hsqldb/lib/KMPSearchAlgorithm.java
rename to src/main/java/org/hsqldb/lib/KMPSearchAlgorithm.java
diff --git a/src/org/hsqldb/lib/LineGroupReader.java b/src/main/java/org/hsqldb/lib/LineGroupReader.java
similarity index 100%
rename from src/org/hsqldb/lib/LineGroupReader.java
rename to src/main/java/org/hsqldb/lib/LineGroupReader.java
diff --git a/src/org/hsqldb/lib/LineReader.java b/src/main/java/org/hsqldb/lib/LineReader.java
similarity index 100%
rename from src/org/hsqldb/lib/LineReader.java
rename to src/main/java/org/hsqldb/lib/LineReader.java
diff --git a/src/org/hsqldb/lib/LongDeque.java b/src/main/java/org/hsqldb/lib/LongDeque.java
similarity index 100%
rename from src/org/hsqldb/lib/LongDeque.java
rename to src/main/java/org/hsqldb/lib/LongDeque.java
diff --git a/src/org/hsqldb/lib/LongKeyHashMap.java b/src/main/java/org/hsqldb/lib/LongKeyHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/LongKeyHashMap.java
rename to src/main/java/org/hsqldb/lib/LongKeyHashMap.java
diff --git a/src/org/hsqldb/lib/LongKeyIntValueHashMap.java b/src/main/java/org/hsqldb/lib/LongKeyIntValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/LongKeyIntValueHashMap.java
rename to src/main/java/org/hsqldb/lib/LongKeyIntValueHashMap.java
diff --git a/src/org/hsqldb/lib/LongKeyLongValueHashMap.java b/src/main/java/org/hsqldb/lib/LongKeyLongValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/LongKeyLongValueHashMap.java
rename to src/main/java/org/hsqldb/lib/LongKeyLongValueHashMap.java
diff --git a/src/org/hsqldb/lib/LongLookup.java b/src/main/java/org/hsqldb/lib/LongLookup.java
similarity index 100%
rename from src/org/hsqldb/lib/LongLookup.java
rename to src/main/java/org/hsqldb/lib/LongLookup.java
diff --git a/src/org/hsqldb/lib/LongValueHashMap.java b/src/main/java/org/hsqldb/lib/LongValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/LongValueHashMap.java
rename to src/main/java/org/hsqldb/lib/LongValueHashMap.java
diff --git a/src/org/hsqldb/lib/MultiValueHashMap.java b/src/main/java/org/hsqldb/lib/MultiValueHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/MultiValueHashMap.java
rename to src/main/java/org/hsqldb/lib/MultiValueHashMap.java
diff --git a/src/org/hsqldb/lib/Notified.java b/src/main/java/org/hsqldb/lib/Notified.java
similarity index 100%
rename from src/org/hsqldb/lib/Notified.java
rename to src/main/java/org/hsqldb/lib/Notified.java
diff --git a/src/org/hsqldb/lib/ObjectComparator.java b/src/main/java/org/hsqldb/lib/ObjectComparator.java
similarity index 100%
rename from src/org/hsqldb/lib/ObjectComparator.java
rename to src/main/java/org/hsqldb/lib/ObjectComparator.java
diff --git a/src/org/hsqldb/lib/OrderedHashSet.java b/src/main/java/org/hsqldb/lib/OrderedHashSet.java
similarity index 100%
rename from src/org/hsqldb/lib/OrderedHashSet.java
rename to src/main/java/org/hsqldb/lib/OrderedHashSet.java
diff --git a/src/org/hsqldb/lib/OrderedIntHashSet.java b/src/main/java/org/hsqldb/lib/OrderedIntHashSet.java
similarity index 100%
rename from src/org/hsqldb/lib/OrderedIntHashSet.java
rename to src/main/java/org/hsqldb/lib/OrderedIntHashSet.java
diff --git a/src/org/hsqldb/lib/OrderedIntKeyHashMap.java b/src/main/java/org/hsqldb/lib/OrderedIntKeyHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/OrderedIntKeyHashMap.java
rename to src/main/java/org/hsqldb/lib/OrderedIntKeyHashMap.java
diff --git a/src/org/hsqldb/lib/OrderedLongHashSet.java b/src/main/java/org/hsqldb/lib/OrderedLongHashSet.java
similarity index 100%
rename from src/org/hsqldb/lib/OrderedLongHashSet.java
rename to src/main/java/org/hsqldb/lib/OrderedLongHashSet.java
diff --git a/src/org/hsqldb/lib/OrderedLongKeyHashMap.java b/src/main/java/org/hsqldb/lib/OrderedLongKeyHashMap.java
similarity index 100%
rename from src/org/hsqldb/lib/OrderedLongKeyHashMap.java
rename to src/main/java/org/hsqldb/lib/OrderedLongKeyHashMap.java
diff --git a/src/org/hsqldb/lib/RCData.java b/src/main/java/org/hsqldb/lib/RCData.java
similarity index 100%
rename from src/org/hsqldb/lib/RCData.java
rename to src/main/java/org/hsqldb/lib/RCData.java
diff --git a/src/org/hsqldb/lib/ReadWriteLockDummy.java b/src/main/java/org/hsqldb/lib/ReadWriteLockDummy.java
similarity index 100%
rename from src/org/hsqldb/lib/ReadWriteLockDummy.java
rename to src/main/java/org/hsqldb/lib/ReadWriteLockDummy.java
diff --git a/src/org/hsqldb/lib/ReaderInputStream.java b/src/main/java/org/hsqldb/lib/ReaderInputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/ReaderInputStream.java
rename to src/main/java/org/hsqldb/lib/ReaderInputStream.java
diff --git a/src/org/hsqldb/lib/RefCapablePropertyResourceBundle.java b/src/main/java/org/hsqldb/lib/RefCapablePropertyResourceBundle.java
similarity index 100%
rename from src/org/hsqldb/lib/RefCapablePropertyResourceBundle.java
rename to src/main/java/org/hsqldb/lib/RefCapablePropertyResourceBundle.java
diff --git a/src/org/hsqldb/lib/RefCapableRBInterface.java b/src/main/java/org/hsqldb/lib/RefCapableRBInterface.java
similarity index 100%
rename from src/org/hsqldb/lib/RefCapableRBInterface.java
rename to src/main/java/org/hsqldb/lib/RefCapableRBInterface.java
diff --git a/src/org/hsqldb/lib/Set.java b/src/main/java/org/hsqldb/lib/Set.java
similarity index 100%
rename from src/org/hsqldb/lib/Set.java
rename to src/main/java/org/hsqldb/lib/Set.java
diff --git a/src/org/hsqldb/lib/SimpleLog.java b/src/main/java/org/hsqldb/lib/SimpleLog.java
similarity index 100%
rename from src/org/hsqldb/lib/SimpleLog.java
rename to src/main/java/org/hsqldb/lib/SimpleLog.java
diff --git a/src/org/hsqldb/lib/StopWatch.java b/src/main/java/org/hsqldb/lib/StopWatch.java
similarity index 100%
rename from src/org/hsqldb/lib/StopWatch.java
rename to src/main/java/org/hsqldb/lib/StopWatch.java
diff --git a/src/org/hsqldb/lib/Storage.java b/src/main/java/org/hsqldb/lib/Storage.java
similarity index 100%
rename from src/org/hsqldb/lib/Storage.java
rename to src/main/java/org/hsqldb/lib/Storage.java
diff --git a/src/org/hsqldb/lib/StringComparator.java b/src/main/java/org/hsqldb/lib/StringComparator.java
similarity index 100%
rename from src/org/hsqldb/lib/StringComparator.java
rename to src/main/java/org/hsqldb/lib/StringComparator.java
diff --git a/src/org/hsqldb/lib/StringConverter.java b/src/main/java/org/hsqldb/lib/StringConverter.java
similarity index 100%
rename from src/org/hsqldb/lib/StringConverter.java
rename to src/main/java/org/hsqldb/lib/StringConverter.java
diff --git a/src/org/hsqldb/lib/StringInputStream.java b/src/main/java/org/hsqldb/lib/StringInputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/StringInputStream.java
rename to src/main/java/org/hsqldb/lib/StringInputStream.java
diff --git a/src/org/hsqldb/lib/StringUtil.java b/src/main/java/org/hsqldb/lib/StringUtil.java
similarity index 100%
rename from src/org/hsqldb/lib/StringUtil.java
rename to src/main/java/org/hsqldb/lib/StringUtil.java
diff --git a/src/org/hsqldb/lib/ThreadFactory.java b/src/main/java/org/hsqldb/lib/ThreadFactory.java
similarity index 100%
rename from src/org/hsqldb/lib/ThreadFactory.java
rename to src/main/java/org/hsqldb/lib/ThreadFactory.java
diff --git a/src/org/hsqldb/lib/ValidatingResourceBundle.java b/src/main/java/org/hsqldb/lib/ValidatingResourceBundle.java
similarity index 100%
rename from src/org/hsqldb/lib/ValidatingResourceBundle.java
rename to src/main/java/org/hsqldb/lib/ValidatingResourceBundle.java
diff --git a/src/org/hsqldb/lib/WrapperIterator.java b/src/main/java/org/hsqldb/lib/WrapperIterator.java
similarity index 100%
rename from src/org/hsqldb/lib/WrapperIterator.java
rename to src/main/java/org/hsqldb/lib/WrapperIterator.java
diff --git a/src/org/hsqldb/lib/java/JavaSystem.java b/src/main/java/org/hsqldb/lib/java/JavaSystem.java
similarity index 100%
rename from src/org/hsqldb/lib/java/JavaSystem.java
rename to src/main/java/org/hsqldb/lib/java/JavaSystem.java
diff --git a/src/org/hsqldb/lib/tar/DbBackup.java b/src/main/java/org/hsqldb/lib/tar/DbBackup.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/DbBackup.java
rename to src/main/java/org/hsqldb/lib/tar/DbBackup.java
diff --git a/src/org/hsqldb/lib/tar/DbBackupMain.java b/src/main/java/org/hsqldb/lib/tar/DbBackupMain.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/DbBackupMain.java
rename to src/main/java/org/hsqldb/lib/tar/DbBackupMain.java
diff --git a/src/org/hsqldb/lib/tar/PIFData.java b/src/main/java/org/hsqldb/lib/tar/PIFData.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/PIFData.java
rename to src/main/java/org/hsqldb/lib/tar/PIFData.java
diff --git a/src/org/hsqldb/lib/tar/PIFGenerator.java b/src/main/java/org/hsqldb/lib/tar/PIFGenerator.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/PIFGenerator.java
rename to src/main/java/org/hsqldb/lib/tar/PIFGenerator.java
diff --git a/src/org/hsqldb/lib/tar/RB.java b/src/main/java/org/hsqldb/lib/tar/RB.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/RB.java
rename to src/main/java/org/hsqldb/lib/tar/RB.java
diff --git a/src/org/hsqldb/lib/tar/TarFileInputStream.java b/src/main/java/org/hsqldb/lib/tar/TarFileInputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarFileInputStream.java
rename to src/main/java/org/hsqldb/lib/tar/TarFileInputStream.java
diff --git a/src/org/hsqldb/lib/tar/TarFileOutputStream.java b/src/main/java/org/hsqldb/lib/tar/TarFileOutputStream.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarFileOutputStream.java
rename to src/main/java/org/hsqldb/lib/tar/TarFileOutputStream.java
diff --git a/src/org/hsqldb/lib/tar/TarGenerator.java b/src/main/java/org/hsqldb/lib/tar/TarGenerator.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarGenerator.java
rename to src/main/java/org/hsqldb/lib/tar/TarGenerator.java
diff --git a/src/org/hsqldb/lib/tar/TarGeneratorMain.java b/src/main/java/org/hsqldb/lib/tar/TarGeneratorMain.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarGeneratorMain.java
rename to src/main/java/org/hsqldb/lib/tar/TarGeneratorMain.java
diff --git a/src/org/hsqldb/lib/tar/TarHeaderField.java b/src/main/java/org/hsqldb/lib/tar/TarHeaderField.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarHeaderField.java
rename to src/main/java/org/hsqldb/lib/tar/TarHeaderField.java
diff --git a/src/org/hsqldb/lib/tar/TarMalformatException.java b/src/main/java/org/hsqldb/lib/tar/TarMalformatException.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarMalformatException.java
rename to src/main/java/org/hsqldb/lib/tar/TarMalformatException.java
diff --git a/src/org/hsqldb/lib/tar/TarReader.java b/src/main/java/org/hsqldb/lib/tar/TarReader.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarReader.java
rename to src/main/java/org/hsqldb/lib/tar/TarReader.java
diff --git a/src/org/hsqldb/lib/tar/TarReaderMain.java b/src/main/java/org/hsqldb/lib/tar/TarReaderMain.java
similarity index 100%
rename from src/org/hsqldb/lib/tar/TarReaderMain.java
rename to src/main/java/org/hsqldb/lib/tar/TarReaderMain.java
diff --git a/src/org/hsqldb/lib/tar/rb.properties b/src/main/java/org/hsqldb/lib/tar/rb.properties
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb.properties
rename to src/main/java/org/hsqldb/lib/tar/rb.properties
diff --git a/src/org/hsqldb/lib/tar/rb/DbBackup.syntax.text b/src/main/java/org/hsqldb/lib/tar/rb/DbBackup.syntax.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/DbBackup.syntax.text
rename to src/main/java/org/hsqldb/lib/tar/rb/DbBackup.syntax.text
diff --git a/src/org/hsqldb/lib/tar/rb/DbBackup.syntax_de.text b/src/main/java/org/hsqldb/lib/tar/rb/DbBackup.syntax_de.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/DbBackup.syntax_de.text
rename to src/main/java/org/hsqldb/lib/tar/rb/DbBackup.syntax_de.text
diff --git a/src/org/hsqldb/lib/tar/rb/TarGenerator.syntax.text b/src/main/java/org/hsqldb/lib/tar/rb/TarGenerator.syntax.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/TarGenerator.syntax.text
rename to src/main/java/org/hsqldb/lib/tar/rb/TarGenerator.syntax.text
diff --git a/src/org/hsqldb/lib/tar/rb/TarGenerator.syntax_de.text b/src/main/java/org/hsqldb/lib/tar/rb/TarGenerator.syntax_de.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/TarGenerator.syntax_de.text
rename to src/main/java/org/hsqldb/lib/tar/rb/TarGenerator.syntax_de.text
diff --git a/src/org/hsqldb/lib/tar/rb/TarReader.syntax.text b/src/main/java/org/hsqldb/lib/tar/rb/TarReader.syntax.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/TarReader.syntax.text
rename to src/main/java/org/hsqldb/lib/tar/rb/TarReader.syntax.text
diff --git a/src/org/hsqldb/lib/tar/rb/TarReader.syntax_de.text b/src/main/java/org/hsqldb/lib/tar/rb/TarReader.syntax_de.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/TarReader.syntax_de.text
rename to src/main/java/org/hsqldb/lib/tar/rb/TarReader.syntax_de.text
diff --git a/src/org/hsqldb/lib/tar/rb/listing.format.text b/src/main/java/org/hsqldb/lib/tar/rb/listing.format.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/listing.format.text
rename to src/main/java/org/hsqldb/lib/tar/rb/listing.format.text
diff --git a/src/org/hsqldb/lib/tar/rb/listing.format_de.text b/src/main/java/org/hsqldb/lib/tar/rb/listing.format_de.text
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb/listing.format_de.text
rename to src/main/java/org/hsqldb/lib/tar/rb/listing.format_de.text
diff --git a/src/org/hsqldb/lib/tar/rb_de.properties b/src/main/java/org/hsqldb/lib/tar/rb_de.properties
similarity index 100%
rename from src/org/hsqldb/lib/tar/rb_de.properties
rename to src/main/java/org/hsqldb/lib/tar/rb_de.properties
diff --git a/src/org/hsqldb/map/BaseHashMap.java b/src/main/java/org/hsqldb/map/BaseHashMap.java
similarity index 100%
rename from src/org/hsqldb/map/BaseHashMap.java
rename to src/main/java/org/hsqldb/map/BaseHashMap.java
diff --git a/src/org/hsqldb/map/BitMap.java b/src/main/java/org/hsqldb/map/BitMap.java
similarity index 100%
rename from src/org/hsqldb/map/BitMap.java
rename to src/main/java/org/hsqldb/map/BitMap.java
diff --git a/src/org/hsqldb/map/HashIndex.java b/src/main/java/org/hsqldb/map/HashIndex.java
similarity index 100%
rename from src/org/hsqldb/map/HashIndex.java
rename to src/main/java/org/hsqldb/map/HashIndex.java
diff --git a/src/org/hsqldb/map/ReusableObjectCache.java b/src/main/java/org/hsqldb/map/ReusableObjectCache.java
similarity index 100%
rename from src/org/hsqldb/map/ReusableObjectCache.java
rename to src/main/java/org/hsqldb/map/ReusableObjectCache.java
diff --git a/src/org/hsqldb/map/ValuePool.java b/src/main/java/org/hsqldb/map/ValuePool.java
similarity index 100%
rename from src/org/hsqldb/map/ValuePool.java
rename to src/main/java/org/hsqldb/map/ValuePool.java
diff --git a/src/org/hsqldb/map/ValuePoolHashMap.java b/src/main/java/org/hsqldb/map/ValuePoolHashMap.java
similarity index 100%
rename from src/org/hsqldb/map/ValuePoolHashMap.java
rename to src/main/java/org/hsqldb/map/ValuePoolHashMap.java
diff --git a/src/org/hsqldb/navigator/RangeIterator.java b/src/main/java/org/hsqldb/navigator/RangeIterator.java
similarity index 100%
rename from src/org/hsqldb/navigator/RangeIterator.java
rename to src/main/java/org/hsqldb/navigator/RangeIterator.java
diff --git a/src/org/hsqldb/navigator/RowIterator.java b/src/main/java/org/hsqldb/navigator/RowIterator.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowIterator.java
rename to src/main/java/org/hsqldb/navigator/RowIterator.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigator.java b/src/main/java/org/hsqldb/navigator/RowSetNavigator.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigator.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigator.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigatorClient.java b/src/main/java/org/hsqldb/navigator/RowSetNavigatorClient.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigatorClient.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigatorClient.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigatorData.java b/src/main/java/org/hsqldb/navigator/RowSetNavigatorData.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigatorData.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigatorData.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigatorDataChange.java b/src/main/java/org/hsqldb/navigator/RowSetNavigatorDataChange.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigatorDataChange.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigatorDataChange.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigatorDataChangeMemory.java b/src/main/java/org/hsqldb/navigator/RowSetNavigatorDataChangeMemory.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigatorDataChangeMemory.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigatorDataChangeMemory.java
diff --git a/src/org/hsqldb/navigator/RowSetNavigatorDataTable.java b/src/main/java/org/hsqldb/navigator/RowSetNavigatorDataTable.java
similarity index 100%
rename from src/org/hsqldb/navigator/RowSetNavigatorDataTable.java
rename to src/main/java/org/hsqldb/navigator/RowSetNavigatorDataTable.java
diff --git a/src/org/hsqldb/persist/BitMapCachedObject.java b/src/main/java/org/hsqldb/persist/BitMapCachedObject.java
similarity index 100%
rename from src/org/hsqldb/persist/BitMapCachedObject.java
rename to src/main/java/org/hsqldb/persist/BitMapCachedObject.java
diff --git a/src/org/hsqldb/persist/BlockObjectStore.java b/src/main/java/org/hsqldb/persist/BlockObjectStore.java
similarity index 100%
rename from src/org/hsqldb/persist/BlockObjectStore.java
rename to src/main/java/org/hsqldb/persist/BlockObjectStore.java
diff --git a/src/org/hsqldb/persist/Cache.java b/src/main/java/org/hsqldb/persist/Cache.java
similarity index 100%
rename from src/org/hsqldb/persist/Cache.java
rename to src/main/java/org/hsqldb/persist/Cache.java
diff --git a/src/org/hsqldb/persist/CachedObject.java b/src/main/java/org/hsqldb/persist/CachedObject.java
similarity index 100%
rename from src/org/hsqldb/persist/CachedObject.java
rename to src/main/java/org/hsqldb/persist/CachedObject.java
diff --git a/src/org/hsqldb/persist/CachedObjectBase.java b/src/main/java/org/hsqldb/persist/CachedObjectBase.java
similarity index 100%
rename from src/org/hsqldb/persist/CachedObjectBase.java
rename to src/main/java/org/hsqldb/persist/CachedObjectBase.java
diff --git a/src/org/hsqldb/persist/Crypto.java b/src/main/java/org/hsqldb/persist/Crypto.java
similarity index 100%
rename from src/org/hsqldb/persist/Crypto.java
rename to src/main/java/org/hsqldb/persist/Crypto.java
diff --git a/src/org/hsqldb/persist/DataFileCache.java b/src/main/java/org/hsqldb/persist/DataFileCache.java
similarity index 100%
rename from src/org/hsqldb/persist/DataFileCache.java
rename to src/main/java/org/hsqldb/persist/DataFileCache.java
diff --git a/src/org/hsqldb/persist/DataFileCacheSession.java b/src/main/java/org/hsqldb/persist/DataFileCacheSession.java
similarity index 100%
rename from src/org/hsqldb/persist/DataFileCacheSession.java
rename to src/main/java/org/hsqldb/persist/DataFileCacheSession.java
diff --git a/src/org/hsqldb/persist/DataFileDefrag.java b/src/main/java/org/hsqldb/persist/DataFileDefrag.java
similarity index 100%
rename from src/org/hsqldb/persist/DataFileDefrag.java
rename to src/main/java/org/hsqldb/persist/DataFileDefrag.java
diff --git a/src/org/hsqldb/persist/DataSpaceManager.java b/src/main/java/org/hsqldb/persist/DataSpaceManager.java
similarity index 100%
rename from src/org/hsqldb/persist/DataSpaceManager.java
rename to src/main/java/org/hsqldb/persist/DataSpaceManager.java
diff --git a/src/org/hsqldb/persist/DataSpaceManagerBlocks.java b/src/main/java/org/hsqldb/persist/DataSpaceManagerBlocks.java
similarity index 100%
rename from src/org/hsqldb/persist/DataSpaceManagerBlocks.java
rename to src/main/java/org/hsqldb/persist/DataSpaceManagerBlocks.java
diff --git a/src/org/hsqldb/persist/DataSpaceManagerSimple.java b/src/main/java/org/hsqldb/persist/DataSpaceManagerSimple.java
similarity index 100%
rename from src/org/hsqldb/persist/DataSpaceManagerSimple.java
rename to src/main/java/org/hsqldb/persist/DataSpaceManagerSimple.java
diff --git a/src/org/hsqldb/persist/DirectoryBlockCachedObject.java b/src/main/java/org/hsqldb/persist/DirectoryBlockCachedObject.java
similarity index 100%
rename from src/org/hsqldb/persist/DirectoryBlockCachedObject.java
rename to src/main/java/org/hsqldb/persist/DirectoryBlockCachedObject.java
diff --git a/src/org/hsqldb/persist/EventLogInterface.java b/src/main/java/org/hsqldb/persist/EventLogInterface.java
similarity index 100%
rename from src/org/hsqldb/persist/EventLogInterface.java
rename to src/main/java/org/hsqldb/persist/EventLogInterface.java
diff --git a/src/org/hsqldb/persist/HsqlDatabaseProperties.java b/src/main/java/org/hsqldb/persist/HsqlDatabaseProperties.java
similarity index 100%
rename from src/org/hsqldb/persist/HsqlDatabaseProperties.java
rename to src/main/java/org/hsqldb/persist/HsqlDatabaseProperties.java
diff --git a/src/org/hsqldb/persist/HsqlProperties.java b/src/main/java/org/hsqldb/persist/HsqlProperties.java
similarity index 100%
rename from src/org/hsqldb/persist/HsqlProperties.java
rename to src/main/java/org/hsqldb/persist/HsqlProperties.java
diff --git a/src/org/hsqldb/persist/IntArrayCachedObject.java b/src/main/java/org/hsqldb/persist/IntArrayCachedObject.java
similarity index 100%
rename from src/org/hsqldb/persist/IntArrayCachedObject.java
rename to src/main/java/org/hsqldb/persist/IntArrayCachedObject.java
diff --git a/src/org/hsqldb/persist/LobManager.java b/src/main/java/org/hsqldb/persist/LobManager.java
similarity index 100%
rename from src/org/hsqldb/persist/LobManager.java
rename to src/main/java/org/hsqldb/persist/LobManager.java
diff --git a/src/org/hsqldb/persist/LobStore.java b/src/main/java/org/hsqldb/persist/LobStore.java
similarity index 100%
rename from src/org/hsqldb/persist/LobStore.java
rename to src/main/java/org/hsqldb/persist/LobStore.java
diff --git a/src/org/hsqldb/persist/LobStoreInJar.java b/src/main/java/org/hsqldb/persist/LobStoreInJar.java
similarity index 100%
rename from src/org/hsqldb/persist/LobStoreInJar.java
rename to src/main/java/org/hsqldb/persist/LobStoreInJar.java
diff --git a/src/org/hsqldb/persist/LobStoreMem.java b/src/main/java/org/hsqldb/persist/LobStoreMem.java
similarity index 100%
rename from src/org/hsqldb/persist/LobStoreMem.java
rename to src/main/java/org/hsqldb/persist/LobStoreMem.java
diff --git a/src/org/hsqldb/persist/LobStoreRAFile.java b/src/main/java/org/hsqldb/persist/LobStoreRAFile.java
similarity index 100%
rename from src/org/hsqldb/persist/LobStoreRAFile.java
rename to src/main/java/org/hsqldb/persist/LobStoreRAFile.java
diff --git a/src/org/hsqldb/persist/LockFile.java b/src/main/java/org/hsqldb/persist/LockFile.java
similarity index 100%
rename from src/org/hsqldb/persist/LockFile.java
rename to src/main/java/org/hsqldb/persist/LockFile.java
diff --git a/src/org/hsqldb/persist/Log.java b/src/main/java/org/hsqldb/persist/Log.java
similarity index 100%
rename from src/org/hsqldb/persist/Log.java
rename to src/main/java/org/hsqldb/persist/Log.java
diff --git a/src/org/hsqldb/persist/Logger.java b/src/main/java/org/hsqldb/persist/Logger.java
similarity index 100%
rename from src/org/hsqldb/persist/Logger.java
rename to src/main/java/org/hsqldb/persist/Logger.java
diff --git a/src/org/hsqldb/persist/PersistentStore.java b/src/main/java/org/hsqldb/persist/PersistentStore.java
similarity index 100%
rename from src/org/hsqldb/persist/PersistentStore.java
rename to src/main/java/org/hsqldb/persist/PersistentStore.java
diff --git a/src/org/hsqldb/persist/PersistentStoreCollection.java b/src/main/java/org/hsqldb/persist/PersistentStoreCollection.java
similarity index 100%
rename from src/org/hsqldb/persist/PersistentStoreCollection.java
rename to src/main/java/org/hsqldb/persist/PersistentStoreCollection.java
diff --git a/src/org/hsqldb/persist/PersistentStoreCollectionDatabase.java b/src/main/java/org/hsqldb/persist/PersistentStoreCollectionDatabase.java
similarity index 100%
rename from src/org/hsqldb/persist/PersistentStoreCollectionDatabase.java
rename to src/main/java/org/hsqldb/persist/PersistentStoreCollectionDatabase.java
diff --git a/src/org/hsqldb/persist/PersistentStoreCollectionSession.java b/src/main/java/org/hsqldb/persist/PersistentStoreCollectionSession.java
similarity index 100%
rename from src/org/hsqldb/persist/PersistentStoreCollectionSession.java
rename to src/main/java/org/hsqldb/persist/PersistentStoreCollectionSession.java
diff --git a/src/org/hsqldb/persist/RAFile.java b/src/main/java/org/hsqldb/persist/RAFile.java
similarity index 100%
rename from src/org/hsqldb/persist/RAFile.java
rename to src/main/java/org/hsqldb/persist/RAFile.java
diff --git a/src/org/hsqldb/persist/RAFileHybrid.java b/src/main/java/org/hsqldb/persist/RAFileHybrid.java
similarity index 100%
rename from src/org/hsqldb/persist/RAFileHybrid.java
rename to src/main/java/org/hsqldb/persist/RAFileHybrid.java
diff --git a/src/org/hsqldb/persist/RAFileInJar.java b/src/main/java/org/hsqldb/persist/RAFileInJar.java
similarity index 100%
rename from src/org/hsqldb/persist/RAFileInJar.java
rename to src/main/java/org/hsqldb/persist/RAFileInJar.java
diff --git a/src/org/hsqldb/persist/RAFileNIO.java b/src/main/java/org/hsqldb/persist/RAFileNIO.java
similarity index 100%
rename from src/org/hsqldb/persist/RAFileNIO.java
rename to src/main/java/org/hsqldb/persist/RAFileNIO.java
diff --git a/src/org/hsqldb/persist/RAFileSimple.java b/src/main/java/org/hsqldb/persist/RAFileSimple.java
similarity index 100%
rename from src/org/hsqldb/persist/RAFileSimple.java
rename to src/main/java/org/hsqldb/persist/RAFileSimple.java
diff --git a/src/org/hsqldb/persist/RAShadowFile.java b/src/main/java/org/hsqldb/persist/RAShadowFile.java
similarity index 100%
rename from src/org/hsqldb/persist/RAShadowFile.java
rename to src/main/java/org/hsqldb/persist/RAShadowFile.java
diff --git a/src/org/hsqldb/persist/RAStorageWrapper.java b/src/main/java/org/hsqldb/persist/RAStorageWrapper.java
similarity index 100%
rename from src/org/hsqldb/persist/RAStorageWrapper.java
rename to src/main/java/org/hsqldb/persist/RAStorageWrapper.java
diff --git a/src/org/hsqldb/persist/RandomAccessInterface.java b/src/main/java/org/hsqldb/persist/RandomAccessInterface.java
similarity index 100%
rename from src/org/hsqldb/persist/RandomAccessInterface.java
rename to src/main/java/org/hsqldb/persist/RandomAccessInterface.java
diff --git a/src/org/hsqldb/persist/RowStoreAVL.java b/src/main/java/org/hsqldb/persist/RowStoreAVL.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVL.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVL.java
diff --git a/src/org/hsqldb/persist/RowStoreAVLDisk.java b/src/main/java/org/hsqldb/persist/RowStoreAVLDisk.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVLDisk.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVLDisk.java
diff --git a/src/org/hsqldb/persist/RowStoreAVLDiskData.java b/src/main/java/org/hsqldb/persist/RowStoreAVLDiskData.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVLDiskData.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVLDiskData.java
diff --git a/src/org/hsqldb/persist/RowStoreAVLHybrid.java b/src/main/java/org/hsqldb/persist/RowStoreAVLHybrid.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVLHybrid.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVLHybrid.java
diff --git a/src/org/hsqldb/persist/RowStoreAVLHybridExtended.java b/src/main/java/org/hsqldb/persist/RowStoreAVLHybridExtended.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVLHybridExtended.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVLHybridExtended.java
diff --git a/src/org/hsqldb/persist/RowStoreAVLMemory.java b/src/main/java/org/hsqldb/persist/RowStoreAVLMemory.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreAVLMemory.java
rename to src/main/java/org/hsqldb/persist/RowStoreAVLMemory.java
diff --git a/src/org/hsqldb/persist/RowStoreDataChange.java b/src/main/java/org/hsqldb/persist/RowStoreDataChange.java
similarity index 100%
rename from src/org/hsqldb/persist/RowStoreDataChange.java
rename to src/main/java/org/hsqldb/persist/RowStoreDataChange.java
diff --git a/src/org/hsqldb/persist/ScriptRunner.java b/src/main/java/org/hsqldb/persist/ScriptRunner.java
similarity index 100%
rename from src/org/hsqldb/persist/ScriptRunner.java
rename to src/main/java/org/hsqldb/persist/ScriptRunner.java
diff --git a/src/org/hsqldb/persist/SimpleStore.java b/src/main/java/org/hsqldb/persist/SimpleStore.java
similarity index 100%
rename from src/org/hsqldb/persist/SimpleStore.java
rename to src/main/java/org/hsqldb/persist/SimpleStore.java
diff --git a/src/org/hsqldb/persist/TableSpaceManager.java b/src/main/java/org/hsqldb/persist/TableSpaceManager.java
similarity index 100%
rename from src/org/hsqldb/persist/TableSpaceManager.java
rename to src/main/java/org/hsqldb/persist/TableSpaceManager.java
diff --git a/src/org/hsqldb/persist/TableSpaceManagerBlocks.java b/src/main/java/org/hsqldb/persist/TableSpaceManagerBlocks.java
similarity index 100%
rename from src/org/hsqldb/persist/TableSpaceManagerBlocks.java
rename to src/main/java/org/hsqldb/persist/TableSpaceManagerBlocks.java
diff --git a/src/org/hsqldb/persist/TableSpaceManagerSimple.java b/src/main/java/org/hsqldb/persist/TableSpaceManagerSimple.java
similarity index 100%
rename from src/org/hsqldb/persist/TableSpaceManagerSimple.java
rename to src/main/java/org/hsqldb/persist/TableSpaceManagerSimple.java
diff --git a/src/org/hsqldb/persist/TextCache.java b/src/main/java/org/hsqldb/persist/TextCache.java
similarity index 100%
rename from src/org/hsqldb/persist/TextCache.java
rename to src/main/java/org/hsqldb/persist/TextCache.java
diff --git a/src/org/hsqldb/persist/TextFileReader.java b/src/main/java/org/hsqldb/persist/TextFileReader.java
similarity index 100%
rename from src/org/hsqldb/persist/TextFileReader.java
rename to src/main/java/org/hsqldb/persist/TextFileReader.java
diff --git a/src/org/hsqldb/persist/TextFileReader16.java b/src/main/java/org/hsqldb/persist/TextFileReader16.java
similarity index 100%
rename from src/org/hsqldb/persist/TextFileReader16.java
rename to src/main/java/org/hsqldb/persist/TextFileReader16.java
diff --git a/src/org/hsqldb/persist/TextFileReader8.java b/src/main/java/org/hsqldb/persist/TextFileReader8.java
similarity index 100%
rename from src/org/hsqldb/persist/TextFileReader8.java
rename to src/main/java/org/hsqldb/persist/TextFileReader8.java
diff --git a/src/org/hsqldb/persist/TextFileSettings.java b/src/main/java/org/hsqldb/persist/TextFileSettings.java
similarity index 100%
rename from src/org/hsqldb/persist/TextFileSettings.java
rename to src/main/java/org/hsqldb/persist/TextFileSettings.java
diff --git a/src/org/hsqldb/persist/TextTableStorageManager.java b/src/main/java/org/hsqldb/persist/TextTableStorageManager.java
similarity index 100%
rename from src/org/hsqldb/persist/TextTableStorageManager.java
rename to src/main/java/org/hsqldb/persist/TextTableStorageManager.java
diff --git a/src/org/hsqldb/resources/ResourceBundleHandler.java b/src/main/java/org/hsqldb/resources/ResourceBundleHandler.java
similarity index 100%
rename from src/org/hsqldb/resources/ResourceBundleHandler.java
rename to src/main/java/org/hsqldb/resources/ResourceBundleHandler.java
diff --git a/src/org/hsqldb/resources/info-column-remarks.properties b/src/main/java/org/hsqldb/resources/info-column-remarks.properties
similarity index 100%
rename from src/org/hsqldb/resources/info-column-remarks.properties
rename to src/main/java/org/hsqldb/resources/info-column-remarks.properties
diff --git a/src/org/hsqldb/resources/info-table-remarks.properties b/src/main/java/org/hsqldb/resources/info-table-remarks.properties
similarity index 100%
rename from src/org/hsqldb/resources/info-table-remarks.properties
rename to src/main/java/org/hsqldb/resources/info-table-remarks.properties
diff --git a/src/org/hsqldb/resources/information-schema.sql b/src/main/java/org/hsqldb/resources/information-schema.sql
similarity index 100%
rename from src/org/hsqldb/resources/information-schema.sql
rename to src/main/java/org/hsqldb/resources/information-schema.sql
diff --git a/src/org/hsqldb/resources/jdklogging-default.properties b/src/main/java/org/hsqldb/resources/jdklogging-default.properties
similarity index 100%
rename from src/org/hsqldb/resources/jdklogging-default.properties
rename to src/main/java/org/hsqldb/resources/jdklogging-default.properties
diff --git a/src/org/hsqldb/resources/lob-schema.sql b/src/main/java/org/hsqldb/resources/lob-schema.sql
similarity index 100%
rename from src/org/hsqldb/resources/lob-schema.sql
rename to src/main/java/org/hsqldb/resources/lob-schema.sql
diff --git a/src/org/hsqldb/resources/org_hsqldb_DatabaseClassLoader.properties b/src/main/java/org/hsqldb/resources/org_hsqldb_DatabaseClassLoader.properties
similarity index 100%
rename from src/org/hsqldb/resources/org_hsqldb_DatabaseClassLoader.properties
rename to src/main/java/org/hsqldb/resources/org_hsqldb_DatabaseClassLoader.properties
diff --git a/src/org/hsqldb/resources/org_hsqldb_server_Server_messages.properties b/src/main/java/org/hsqldb/resources/org_hsqldb_server_Server_messages.properties
similarity index 100%
rename from src/org/hsqldb/resources/org_hsqldb_server_Server_messages.properties
rename to src/main/java/org/hsqldb/resources/org_hsqldb_server_Server_messages.properties
diff --git a/src/org/hsqldb/resources/sql-state-messages.properties b/src/main/java/org/hsqldb/resources/sql-state-messages.properties
similarity index 100%
rename from src/org/hsqldb/resources/sql-state-messages.properties
rename to src/main/java/org/hsqldb/resources/sql-state-messages.properties
diff --git a/src/org/hsqldb/resources/sql-state-messages_es.properties b/src/main/java/org/hsqldb/resources/sql-state-messages_es.properties
similarity index 100%
rename from src/org/hsqldb/resources/sql-state-messages_es.properties
rename to src/main/java/org/hsqldb/resources/sql-state-messages_es.properties
diff --git a/src/org/hsqldb/resources/webserver-content-types.properties b/src/main/java/org/hsqldb/resources/webserver-content-types.properties
similarity index 100%
rename from src/org/hsqldb/resources/webserver-content-types.properties
rename to src/main/java/org/hsqldb/resources/webserver-content-types.properties
diff --git a/src/org/hsqldb/resources/webserver-pages.properties b/src/main/java/org/hsqldb/resources/webserver-pages.properties
similarity index 100%
rename from src/org/hsqldb/resources/webserver-pages.properties
rename to src/main/java/org/hsqldb/resources/webserver-pages.properties
diff --git a/src/org/hsqldb/result/Result.java b/src/main/java/org/hsqldb/result/Result.java
similarity index 100%
rename from src/org/hsqldb/result/Result.java
rename to src/main/java/org/hsqldb/result/Result.java
diff --git a/src/org/hsqldb/result/ResultConstants.java b/src/main/java/org/hsqldb/result/ResultConstants.java
similarity index 100%
rename from src/org/hsqldb/result/ResultConstants.java
rename to src/main/java/org/hsqldb/result/ResultConstants.java
diff --git a/src/org/hsqldb/result/ResultLob.java b/src/main/java/org/hsqldb/result/ResultLob.java
similarity index 100%
rename from src/org/hsqldb/result/ResultLob.java
rename to src/main/java/org/hsqldb/result/ResultLob.java
diff --git a/src/org/hsqldb/result/ResultMetaData.java b/src/main/java/org/hsqldb/result/ResultMetaData.java
similarity index 100%
rename from src/org/hsqldb/result/ResultMetaData.java
rename to src/main/java/org/hsqldb/result/ResultMetaData.java
diff --git a/src/org/hsqldb/result/ResultProperties.java b/src/main/java/org/hsqldb/result/ResultProperties.java
similarity index 100%
rename from src/org/hsqldb/result/ResultProperties.java
rename to src/main/java/org/hsqldb/result/ResultProperties.java
diff --git a/src/org/hsqldb/rights/GrantConstants.java b/src/main/java/org/hsqldb/rights/GrantConstants.java
similarity index 100%
rename from src/org/hsqldb/rights/GrantConstants.java
rename to src/main/java/org/hsqldb/rights/GrantConstants.java
diff --git a/src/org/hsqldb/rights/Grantee.java b/src/main/java/org/hsqldb/rights/Grantee.java
similarity index 100%
rename from src/org/hsqldb/rights/Grantee.java
rename to src/main/java/org/hsqldb/rights/Grantee.java
diff --git a/src/org/hsqldb/rights/GranteeManager.java b/src/main/java/org/hsqldb/rights/GranteeManager.java
similarity index 100%
rename from src/org/hsqldb/rights/GranteeManager.java
rename to src/main/java/org/hsqldb/rights/GranteeManager.java
diff --git a/src/org/hsqldb/rights/Right.java b/src/main/java/org/hsqldb/rights/Right.java
similarity index 100%
rename from src/org/hsqldb/rights/Right.java
rename to src/main/java/org/hsqldb/rights/Right.java
diff --git a/src/org/hsqldb/rights/User.java b/src/main/java/org/hsqldb/rights/User.java
similarity index 100%
rename from src/org/hsqldb/rights/User.java
rename to src/main/java/org/hsqldb/rights/User.java
diff --git a/src/org/hsqldb/rights/UserManager.java b/src/main/java/org/hsqldb/rights/UserManager.java
similarity index 100%
rename from src/org/hsqldb/rights/UserManager.java
rename to src/main/java/org/hsqldb/rights/UserManager.java
diff --git a/src/org/hsqldb/rowio/RowInputBase.java b/src/main/java/org/hsqldb/rowio/RowInputBase.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputBase.java
rename to src/main/java/org/hsqldb/rowio/RowInputBase.java
diff --git a/src/org/hsqldb/rowio/RowInputBinary.java b/src/main/java/org/hsqldb/rowio/RowInputBinary.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputBinary.java
rename to src/main/java/org/hsqldb/rowio/RowInputBinary.java
diff --git a/src/org/hsqldb/rowio/RowInputBinary180.java b/src/main/java/org/hsqldb/rowio/RowInputBinary180.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputBinary180.java
rename to src/main/java/org/hsqldb/rowio/RowInputBinary180.java
diff --git a/src/org/hsqldb/rowio/RowInputBinaryDecode.java b/src/main/java/org/hsqldb/rowio/RowInputBinaryDecode.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputBinaryDecode.java
rename to src/main/java/org/hsqldb/rowio/RowInputBinaryDecode.java
diff --git a/src/org/hsqldb/rowio/RowInputInterface.java b/src/main/java/org/hsqldb/rowio/RowInputInterface.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputInterface.java
rename to src/main/java/org/hsqldb/rowio/RowInputInterface.java
diff --git a/src/org/hsqldb/rowio/RowInputText.java b/src/main/java/org/hsqldb/rowio/RowInputText.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputText.java
rename to src/main/java/org/hsqldb/rowio/RowInputText.java
diff --git a/src/org/hsqldb/rowio/RowInputTextLog.java b/src/main/java/org/hsqldb/rowio/RowInputTextLog.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputTextLog.java
rename to src/main/java/org/hsqldb/rowio/RowInputTextLog.java
diff --git a/src/org/hsqldb/rowio/RowInputTextQuoted.java b/src/main/java/org/hsqldb/rowio/RowInputTextQuoted.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowInputTextQuoted.java
rename to src/main/java/org/hsqldb/rowio/RowInputTextQuoted.java
diff --git a/src/org/hsqldb/rowio/RowOutputBase.java b/src/main/java/org/hsqldb/rowio/RowOutputBase.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputBase.java
rename to src/main/java/org/hsqldb/rowio/RowOutputBase.java
diff --git a/src/org/hsqldb/rowio/RowOutputBinary.java b/src/main/java/org/hsqldb/rowio/RowOutputBinary.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputBinary.java
rename to src/main/java/org/hsqldb/rowio/RowOutputBinary.java
diff --git a/src/org/hsqldb/rowio/RowOutputBinary180.java b/src/main/java/org/hsqldb/rowio/RowOutputBinary180.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputBinary180.java
rename to src/main/java/org/hsqldb/rowio/RowOutputBinary180.java
diff --git a/src/org/hsqldb/rowio/RowOutputBinaryEncode.java b/src/main/java/org/hsqldb/rowio/RowOutputBinaryEncode.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputBinaryEncode.java
rename to src/main/java/org/hsqldb/rowio/RowOutputBinaryEncode.java
diff --git a/src/org/hsqldb/rowio/RowOutputInterface.java b/src/main/java/org/hsqldb/rowio/RowOutputInterface.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputInterface.java
rename to src/main/java/org/hsqldb/rowio/RowOutputInterface.java
diff --git a/src/org/hsqldb/rowio/RowOutputText.java b/src/main/java/org/hsqldb/rowio/RowOutputText.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputText.java
rename to src/main/java/org/hsqldb/rowio/RowOutputText.java
diff --git a/src/org/hsqldb/rowio/RowOutputTextLog.java b/src/main/java/org/hsqldb/rowio/RowOutputTextLog.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputTextLog.java
rename to src/main/java/org/hsqldb/rowio/RowOutputTextLog.java
diff --git a/src/org/hsqldb/rowio/RowOutputTextQuoted.java b/src/main/java/org/hsqldb/rowio/RowOutputTextQuoted.java
similarity index 100%
rename from src/org/hsqldb/rowio/RowOutputTextQuoted.java
rename to src/main/java/org/hsqldb/rowio/RowOutputTextQuoted.java
diff --git a/src/org/hsqldb/sample/ConnectionTypesSample.java b/src/main/java/org/hsqldb/sample/ConnectionTypesSample.java
similarity index 100%
rename from src/org/hsqldb/sample/ConnectionTypesSample.java
rename to src/main/java/org/hsqldb/sample/ConnectionTypesSample.java
diff --git a/src/org/hsqldb/sample/DatabaseManagerSample.java b/src/main/java/org/hsqldb/sample/DatabaseManagerSample.java
similarity index 100%
rename from src/org/hsqldb/sample/DatabaseManagerSample.java
rename to src/main/java/org/hsqldb/sample/DatabaseManagerSample.java
diff --git a/src/org/hsqldb/sample/FindFile.java b/src/main/java/org/hsqldb/sample/FindFile.java
similarity index 100%
rename from src/org/hsqldb/sample/FindFile.java
rename to src/main/java/org/hsqldb/sample/FindFile.java
diff --git a/src/org/hsqldb/sample/SqlFileEmbedder.java b/src/main/java/org/hsqldb/sample/SqlFileEmbedder.java
similarity index 100%
rename from src/org/hsqldb/sample/SqlFileEmbedder.java
rename to src/main/java/org/hsqldb/sample/SqlFileEmbedder.java
diff --git a/src/org/hsqldb/sample/TriggerSample.java b/src/main/java/org/hsqldb/sample/TriggerSample.java
similarity index 100%
rename from src/org/hsqldb/sample/TriggerSample.java
rename to src/main/java/org/hsqldb/sample/TriggerSample.java
diff --git a/src/org/hsqldb/scriptio/ScriptReaderBase.java b/src/main/java/org/hsqldb/scriptio/ScriptReaderBase.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptReaderBase.java
rename to src/main/java/org/hsqldb/scriptio/ScriptReaderBase.java
diff --git a/src/org/hsqldb/scriptio/ScriptReaderDecode.java b/src/main/java/org/hsqldb/scriptio/ScriptReaderDecode.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptReaderDecode.java
rename to src/main/java/org/hsqldb/scriptio/ScriptReaderDecode.java
diff --git a/src/org/hsqldb/scriptio/ScriptReaderText.java b/src/main/java/org/hsqldb/scriptio/ScriptReaderText.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptReaderText.java
rename to src/main/java/org/hsqldb/scriptio/ScriptReaderText.java
diff --git a/src/org/hsqldb/scriptio/ScriptWriterBase.java b/src/main/java/org/hsqldb/scriptio/ScriptWriterBase.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptWriterBase.java
rename to src/main/java/org/hsqldb/scriptio/ScriptWriterBase.java
diff --git a/src/org/hsqldb/scriptio/ScriptWriterEncode.java b/src/main/java/org/hsqldb/scriptio/ScriptWriterEncode.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptWriterEncode.java
rename to src/main/java/org/hsqldb/scriptio/ScriptWriterEncode.java
diff --git a/src/org/hsqldb/scriptio/ScriptWriterText.java b/src/main/java/org/hsqldb/scriptio/ScriptWriterText.java
similarity index 100%
rename from src/org/hsqldb/scriptio/ScriptWriterText.java
rename to src/main/java/org/hsqldb/scriptio/ScriptWriterText.java
diff --git a/src/org/hsqldb/server/HsqlServerFactory.java b/src/main/java/org/hsqldb/server/HsqlServerFactory.java
similarity index 100%
rename from src/org/hsqldb/server/HsqlServerFactory.java
rename to src/main/java/org/hsqldb/server/HsqlServerFactory.java
diff --git a/src/org/hsqldb/server/HsqlSocketFactory.java b/src/main/java/org/hsqldb/server/HsqlSocketFactory.java
similarity index 100%
rename from src/org/hsqldb/server/HsqlSocketFactory.java
rename to src/main/java/org/hsqldb/server/HsqlSocketFactory.java
diff --git a/src/org/hsqldb/server/HsqlSocketFactorySecure.java b/src/main/java/org/hsqldb/server/HsqlSocketFactorySecure.java
similarity index 100%
rename from src/org/hsqldb/server/HsqlSocketFactorySecure.java
rename to src/main/java/org/hsqldb/server/HsqlSocketFactorySecure.java
diff --git a/src/org/hsqldb/server/HsqlSocketRequestHandler.java b/src/main/java/org/hsqldb/server/HsqlSocketRequestHandler.java
similarity index 100%
rename from src/org/hsqldb/server/HsqlSocketRequestHandler.java
rename to src/main/java/org/hsqldb/server/HsqlSocketRequestHandler.java
diff --git a/src/org/hsqldb/server/OdbcPacketInputStream.java b/src/main/java/org/hsqldb/server/OdbcPacketInputStream.java
similarity index 100%
rename from src/org/hsqldb/server/OdbcPacketInputStream.java
rename to src/main/java/org/hsqldb/server/OdbcPacketInputStream.java
diff --git a/src/org/hsqldb/server/OdbcPacketOutputStream.java b/src/main/java/org/hsqldb/server/OdbcPacketOutputStream.java
similarity index 100%
rename from src/org/hsqldb/server/OdbcPacketOutputStream.java
rename to src/main/java/org/hsqldb/server/OdbcPacketOutputStream.java
diff --git a/src/org/hsqldb/server/OdbcPreparedStatement.java b/src/main/java/org/hsqldb/server/OdbcPreparedStatement.java
similarity index 100%
rename from src/org/hsqldb/server/OdbcPreparedStatement.java
rename to src/main/java/org/hsqldb/server/OdbcPreparedStatement.java
diff --git a/src/org/hsqldb/server/OdbcUtil.java b/src/main/java/org/hsqldb/server/OdbcUtil.java
similarity index 100%
rename from src/org/hsqldb/server/OdbcUtil.java
rename to src/main/java/org/hsqldb/server/OdbcUtil.java
diff --git a/src/org/hsqldb/server/PgType.java b/src/main/java/org/hsqldb/server/PgType.java
similarity index 100%
rename from src/org/hsqldb/server/PgType.java
rename to src/main/java/org/hsqldb/server/PgType.java
diff --git a/src/org/hsqldb/server/RecoverableOdbcFailure.java b/src/main/java/org/hsqldb/server/RecoverableOdbcFailure.java
similarity index 100%
rename from src/org/hsqldb/server/RecoverableOdbcFailure.java
rename to src/main/java/org/hsqldb/server/RecoverableOdbcFailure.java
diff --git a/src/org/hsqldb/server/Server.java b/src/main/java/org/hsqldb/server/Server.java
similarity index 100%
rename from src/org/hsqldb/server/Server.java
rename to src/main/java/org/hsqldb/server/Server.java
diff --git a/src/org/hsqldb/server/ServerAcl.java b/src/main/java/org/hsqldb/server/ServerAcl.java
similarity index 100%
rename from src/org/hsqldb/server/ServerAcl.java
rename to src/main/java/org/hsqldb/server/ServerAcl.java
diff --git a/src/org/hsqldb/server/ServerConfiguration.java b/src/main/java/org/hsqldb/server/ServerConfiguration.java
similarity index 100%
rename from src/org/hsqldb/server/ServerConfiguration.java
rename to src/main/java/org/hsqldb/server/ServerConfiguration.java
diff --git a/src/org/hsqldb/server/ServerConnection.java b/src/main/java/org/hsqldb/server/ServerConnection.java
similarity index 100%
rename from src/org/hsqldb/server/ServerConnection.java
rename to src/main/java/org/hsqldb/server/ServerConnection.java
diff --git a/src/org/hsqldb/server/ServerConstants.java b/src/main/java/org/hsqldb/server/ServerConstants.java
similarity index 100%
rename from src/org/hsqldb/server/ServerConstants.java
rename to src/main/java/org/hsqldb/server/ServerConstants.java
diff --git a/src/org/hsqldb/server/ServerProperties.java b/src/main/java/org/hsqldb/server/ServerProperties.java
similarity index 100%
rename from src/org/hsqldb/server/ServerProperties.java
rename to src/main/java/org/hsqldb/server/ServerProperties.java
diff --git a/src/org/hsqldb/server/Servlet.java b/src/main/java/org/hsqldb/server/Servlet.java
similarity index 100%
rename from src/org/hsqldb/server/Servlet.java
rename to src/main/java/org/hsqldb/server/Servlet.java
diff --git a/src/org/hsqldb/server/StatementPortal.java b/src/main/java/org/hsqldb/server/StatementPortal.java
similarity index 100%
rename from src/org/hsqldb/server/StatementPortal.java
rename to src/main/java/org/hsqldb/server/StatementPortal.java
diff --git a/src/org/hsqldb/server/WebServer.java b/src/main/java/org/hsqldb/server/WebServer.java
similarity index 100%
rename from src/org/hsqldb/server/WebServer.java
rename to src/main/java/org/hsqldb/server/WebServer.java
diff --git a/src/org/hsqldb/server/WebServerConnection.java b/src/main/java/org/hsqldb/server/WebServerConnection.java
similarity index 100%
rename from src/org/hsqldb/server/WebServerConnection.java
rename to src/main/java/org/hsqldb/server/WebServerConnection.java
diff --git a/src/org/hsqldb/types/ArrayType.java b/src/main/java/org/hsqldb/types/ArrayType.java
similarity index 100%
rename from src/org/hsqldb/types/ArrayType.java
rename to src/main/java/org/hsqldb/types/ArrayType.java
diff --git a/src/org/hsqldb/types/BinaryData.java b/src/main/java/org/hsqldb/types/BinaryData.java
similarity index 100%
rename from src/org/hsqldb/types/BinaryData.java
rename to src/main/java/org/hsqldb/types/BinaryData.java
diff --git a/src/org/hsqldb/types/BinaryType.java b/src/main/java/org/hsqldb/types/BinaryType.java
similarity index 100%
rename from src/org/hsqldb/types/BinaryType.java
rename to src/main/java/org/hsqldb/types/BinaryType.java
diff --git a/src/org/hsqldb/types/BinaryUUIDType.java b/src/main/java/org/hsqldb/types/BinaryUUIDType.java
similarity index 100%
rename from src/org/hsqldb/types/BinaryUUIDType.java
rename to src/main/java/org/hsqldb/types/BinaryUUIDType.java
diff --git a/src/org/hsqldb/types/BitType.java b/src/main/java/org/hsqldb/types/BitType.java
similarity index 100%
rename from src/org/hsqldb/types/BitType.java
rename to src/main/java/org/hsqldb/types/BitType.java
diff --git a/src/org/hsqldb/types/BlobData.java b/src/main/java/org/hsqldb/types/BlobData.java
similarity index 100%
rename from src/org/hsqldb/types/BlobData.java
rename to src/main/java/org/hsqldb/types/BlobData.java
diff --git a/src/org/hsqldb/types/BlobDataID.java b/src/main/java/org/hsqldb/types/BlobDataID.java
similarity index 100%
rename from src/org/hsqldb/types/BlobDataID.java
rename to src/main/java/org/hsqldb/types/BlobDataID.java
diff --git a/src/org/hsqldb/types/BlobInputStream.java b/src/main/java/org/hsqldb/types/BlobInputStream.java
similarity index 100%
rename from src/org/hsqldb/types/BlobInputStream.java
rename to src/main/java/org/hsqldb/types/BlobInputStream.java
diff --git a/src/org/hsqldb/types/BlobType.java b/src/main/java/org/hsqldb/types/BlobType.java
similarity index 100%
rename from src/org/hsqldb/types/BlobType.java
rename to src/main/java/org/hsqldb/types/BlobType.java
diff --git a/src/org/hsqldb/types/BooleanType.java b/src/main/java/org/hsqldb/types/BooleanType.java
similarity index 100%
rename from src/org/hsqldb/types/BooleanType.java
rename to src/main/java/org/hsqldb/types/BooleanType.java
diff --git a/src/org/hsqldb/types/CharacterType.java b/src/main/java/org/hsqldb/types/CharacterType.java
similarity index 100%
rename from src/org/hsqldb/types/CharacterType.java
rename to src/main/java/org/hsqldb/types/CharacterType.java
diff --git a/src/org/hsqldb/types/Charset.java b/src/main/java/org/hsqldb/types/Charset.java
similarity index 100%
rename from src/org/hsqldb/types/Charset.java
rename to src/main/java/org/hsqldb/types/Charset.java
diff --git a/src/org/hsqldb/types/ClobData.java b/src/main/java/org/hsqldb/types/ClobData.java
similarity index 100%
rename from src/org/hsqldb/types/ClobData.java
rename to src/main/java/org/hsqldb/types/ClobData.java
diff --git a/src/org/hsqldb/types/ClobDataID.java b/src/main/java/org/hsqldb/types/ClobDataID.java
similarity index 100%
rename from src/org/hsqldb/types/ClobDataID.java
rename to src/main/java/org/hsqldb/types/ClobDataID.java
diff --git a/src/org/hsqldb/types/ClobInputStream.java b/src/main/java/org/hsqldb/types/ClobInputStream.java
similarity index 100%
rename from src/org/hsqldb/types/ClobInputStream.java
rename to src/main/java/org/hsqldb/types/ClobInputStream.java
diff --git a/src/org/hsqldb/types/ClobType.java b/src/main/java/org/hsqldb/types/ClobType.java
similarity index 100%
rename from src/org/hsqldb/types/ClobType.java
rename to src/main/java/org/hsqldb/types/ClobType.java
diff --git a/src/org/hsqldb/types/Collation.java b/src/main/java/org/hsqldb/types/Collation.java
similarity index 100%
rename from src/org/hsqldb/types/Collation.java
rename to src/main/java/org/hsqldb/types/Collation.java
diff --git a/src/org/hsqldb/types/DTIType.java b/src/main/java/org/hsqldb/types/DTIType.java
similarity index 100%
rename from src/org/hsqldb/types/DTIType.java
rename to src/main/java/org/hsqldb/types/DTIType.java
diff --git a/src/org/hsqldb/types/DateTimeType.java b/src/main/java/org/hsqldb/types/DateTimeType.java
similarity index 100%
rename from src/org/hsqldb/types/DateTimeType.java
rename to src/main/java/org/hsqldb/types/DateTimeType.java
diff --git a/src/org/hsqldb/types/IntervalMonthData.java b/src/main/java/org/hsqldb/types/IntervalMonthData.java
similarity index 100%
rename from src/org/hsqldb/types/IntervalMonthData.java
rename to src/main/java/org/hsqldb/types/IntervalMonthData.java
diff --git a/src/org/hsqldb/types/IntervalSecondData.java b/src/main/java/org/hsqldb/types/IntervalSecondData.java
similarity index 100%
rename from src/org/hsqldb/types/IntervalSecondData.java
rename to src/main/java/org/hsqldb/types/IntervalSecondData.java
diff --git a/src/org/hsqldb/types/IntervalType.java b/src/main/java/org/hsqldb/types/IntervalType.java
similarity index 100%
rename from src/org/hsqldb/types/IntervalType.java
rename to src/main/java/org/hsqldb/types/IntervalType.java
diff --git a/src/org/hsqldb/types/JavaObjectData.java b/src/main/java/org/hsqldb/types/JavaObjectData.java
similarity index 100%
rename from src/org/hsqldb/types/JavaObjectData.java
rename to src/main/java/org/hsqldb/types/JavaObjectData.java
diff --git a/src/org/hsqldb/types/JavaObjectDataInternal.java b/src/main/java/org/hsqldb/types/JavaObjectDataInternal.java
similarity index 100%
rename from src/org/hsqldb/types/JavaObjectDataInternal.java
rename to src/main/java/org/hsqldb/types/JavaObjectDataInternal.java
diff --git a/src/org/hsqldb/types/LobData.java b/src/main/java/org/hsqldb/types/LobData.java
similarity index 100%
rename from src/org/hsqldb/types/LobData.java
rename to src/main/java/org/hsqldb/types/LobData.java
diff --git a/src/org/hsqldb/types/NullType.java b/src/main/java/org/hsqldb/types/NullType.java
similarity index 100%
rename from src/org/hsqldb/types/NullType.java
rename to src/main/java/org/hsqldb/types/NullType.java
diff --git a/src/org/hsqldb/types/NumberType.java b/src/main/java/org/hsqldb/types/NumberType.java
similarity index 100%
rename from src/org/hsqldb/types/NumberType.java
rename to src/main/java/org/hsqldb/types/NumberType.java
diff --git a/src/org/hsqldb/types/OtherType.java b/src/main/java/org/hsqldb/types/OtherType.java
similarity index 100%
rename from src/org/hsqldb/types/OtherType.java
rename to src/main/java/org/hsqldb/types/OtherType.java
diff --git a/src/org/hsqldb/types/RowType.java b/src/main/java/org/hsqldb/types/RowType.java
similarity index 100%
rename from src/org/hsqldb/types/RowType.java
rename to src/main/java/org/hsqldb/types/RowType.java
diff --git a/src/org/hsqldb/types/TimeData.java b/src/main/java/org/hsqldb/types/TimeData.java
similarity index 100%
rename from src/org/hsqldb/types/TimeData.java
rename to src/main/java/org/hsqldb/types/TimeData.java
diff --git a/src/org/hsqldb/types/TimestampData.java b/src/main/java/org/hsqldb/types/TimestampData.java
similarity index 100%
rename from src/org/hsqldb/types/TimestampData.java
rename to src/main/java/org/hsqldb/types/TimestampData.java
diff --git a/src/org/hsqldb/types/Type.java b/src/main/java/org/hsqldb/types/Type.java
similarity index 100%
rename from src/org/hsqldb/types/Type.java
rename to src/main/java/org/hsqldb/types/Type.java
diff --git a/src/org/hsqldb/types/Types.java b/src/main/java/org/hsqldb/types/Types.java
similarity index 100%
rename from src/org/hsqldb/types/Types.java
rename to src/main/java/org/hsqldb/types/Types.java
diff --git a/src/org/hsqldb/types/UserTypeModifier.java b/src/main/java/org/hsqldb/types/UserTypeModifier.java
similarity index 100%
rename from src/org/hsqldb/types/UserTypeModifier.java
rename to src/main/java/org/hsqldb/types/UserTypeModifier.java
diff --git a/src/org/hsqldb/util/Bold.gif b/src/main/java/org/hsqldb/util/Bold.gif
similarity index 100%
rename from src/org/hsqldb/util/Bold.gif
rename to src/main/java/org/hsqldb/util/Bold.gif
diff --git a/src/org/hsqldb/util/CSVWriter.java b/src/main/java/org/hsqldb/util/CSVWriter.java
similarity index 100%
rename from src/org/hsqldb/util/CSVWriter.java
rename to src/main/java/org/hsqldb/util/CSVWriter.java
diff --git a/src/org/hsqldb/util/Clear.png b/src/main/java/org/hsqldb/util/Clear.png
similarity index 100%
rename from src/org/hsqldb/util/Clear.png
rename to src/main/java/org/hsqldb/util/Clear.png
diff --git a/src/org/hsqldb/util/Close.png b/src/main/java/org/hsqldb/util/Close.png
similarity index 100%
rename from src/org/hsqldb/util/Close.png
rename to src/main/java/org/hsqldb/util/Close.png
diff --git a/src/org/hsqldb/util/CodeSwitcher.java b/src/main/java/org/hsqldb/util/CodeSwitcher.java
similarity index 100%
rename from src/org/hsqldb/util/CodeSwitcher.java
rename to src/main/java/org/hsqldb/util/CodeSwitcher.java
diff --git a/src/org/hsqldb/util/Colors.png b/src/main/java/org/hsqldb/util/Colors.png
similarity index 100%
rename from src/org/hsqldb/util/Colors.png
rename to src/main/java/org/hsqldb/util/Colors.png
diff --git a/src/org/hsqldb/util/CommonSwing.java b/src/main/java/org/hsqldb/util/CommonSwing.java
similarity index 100%
rename from src/org/hsqldb/util/CommonSwing.java
rename to src/main/java/org/hsqldb/util/CommonSwing.java
diff --git a/src/org/hsqldb/util/ConnectionDialog.java b/src/main/java/org/hsqldb/util/ConnectionDialog.java
similarity index 100%
rename from src/org/hsqldb/util/ConnectionDialog.java
rename to src/main/java/org/hsqldb/util/ConnectionDialog.java
diff --git a/src/org/hsqldb/util/ConnectionDialogCommon.java b/src/main/java/org/hsqldb/util/ConnectionDialogCommon.java
similarity index 100%
rename from src/org/hsqldb/util/ConnectionDialogCommon.java
rename to src/main/java/org/hsqldb/util/ConnectionDialogCommon.java
diff --git a/src/org/hsqldb/util/ConnectionDialogSwing.java b/src/main/java/org/hsqldb/util/ConnectionDialogSwing.java
similarity index 100%
rename from src/org/hsqldb/util/ConnectionDialogSwing.java
rename to src/main/java/org/hsqldb/util/ConnectionDialogSwing.java
diff --git a/src/org/hsqldb/util/ConnectionSetting.java b/src/main/java/org/hsqldb/util/ConnectionSetting.java
similarity index 100%
rename from src/org/hsqldb/util/ConnectionSetting.java
rename to src/main/java/org/hsqldb/util/ConnectionSetting.java
diff --git a/src/org/hsqldb/util/DataAccessPoint.java b/src/main/java/org/hsqldb/util/DataAccessPoint.java
similarity index 100%
rename from src/org/hsqldb/util/DataAccessPoint.java
rename to src/main/java/org/hsqldb/util/DataAccessPoint.java
diff --git a/src/org/hsqldb/util/DataAccessPointException.java b/src/main/java/org/hsqldb/util/DataAccessPointException.java
similarity index 100%
rename from src/org/hsqldb/util/DataAccessPointException.java
rename to src/main/java/org/hsqldb/util/DataAccessPointException.java
diff --git a/src/org/hsqldb/util/DatabaseManager.java b/src/main/java/org/hsqldb/util/DatabaseManager.java
similarity index 100%
rename from src/org/hsqldb/util/DatabaseManager.java
rename to src/main/java/org/hsqldb/util/DatabaseManager.java
diff --git a/src/org/hsqldb/util/DatabaseManagerCommon.java b/src/main/java/org/hsqldb/util/DatabaseManagerCommon.java
similarity index 100%
rename from src/org/hsqldb/util/DatabaseManagerCommon.java
rename to src/main/java/org/hsqldb/util/DatabaseManagerCommon.java
diff --git a/src/org/hsqldb/util/DatabaseManagerSwing.java b/src/main/java/org/hsqldb/util/DatabaseManagerSwing.java
similarity index 100%
rename from src/org/hsqldb/util/DatabaseManagerSwing.java
rename to src/main/java/org/hsqldb/util/DatabaseManagerSwing.java
diff --git a/src/org/hsqldb/util/FontDialogSwing.java b/src/main/java/org/hsqldb/util/FontDialogSwing.java
similarity index 100%
rename from src/org/hsqldb/util/FontDialogSwing.java
rename to src/main/java/org/hsqldb/util/FontDialogSwing.java
diff --git a/src/org/hsqldb/util/GreenCircle.gif b/src/main/java/org/hsqldb/util/GreenCircle.gif
similarity index 100%
rename from src/org/hsqldb/util/GreenCircle.gif
rename to src/main/java/org/hsqldb/util/GreenCircle.gif
diff --git a/src/org/hsqldb/util/Grid.java b/src/main/java/org/hsqldb/util/Grid.java
similarity index 100%
rename from src/org/hsqldb/util/Grid.java
rename to src/main/java/org/hsqldb/util/Grid.java
diff --git a/src/org/hsqldb/util/GridSwing.java b/src/main/java/org/hsqldb/util/GridSwing.java
similarity index 100%
rename from src/org/hsqldb/util/GridSwing.java
rename to src/main/java/org/hsqldb/util/GridSwing.java
diff --git a/src/org/hsqldb/util/HelperFactory.java b/src/main/java/org/hsqldb/util/HelperFactory.java
similarity index 100%
rename from src/org/hsqldb/util/HelperFactory.java
rename to src/main/java/org/hsqldb/util/HelperFactory.java
diff --git a/src/org/hsqldb/util/Hourglass.gif b/src/main/java/org/hsqldb/util/Hourglass.gif
similarity index 100%
rename from src/org/hsqldb/util/Hourglass.gif
rename to src/main/java/org/hsqldb/util/Hourglass.gif
diff --git a/src/org/hsqldb/util/HsqldbTransferHelper.java b/src/main/java/org/hsqldb/util/HsqldbTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/HsqldbTransferHelper.java
rename to src/main/java/org/hsqldb/util/HsqldbTransferHelper.java
diff --git a/src/org/hsqldb/util/InformixTransferHelper.java b/src/main/java/org/hsqldb/util/InformixTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/InformixTransferHelper.java
rename to src/main/java/org/hsqldb/util/InformixTransferHelper.java
diff --git a/src/org/hsqldb/util/Italic.gif b/src/main/java/org/hsqldb/util/Italic.gif
similarity index 100%
rename from src/org/hsqldb/util/Italic.gif
rename to src/main/java/org/hsqldb/util/Italic.gif
diff --git a/src/org/hsqldb/util/JDBCTypes.java b/src/main/java/org/hsqldb/util/JDBCTypes.java
similarity index 100%
rename from src/org/hsqldb/util/JDBCTypes.java
rename to src/main/java/org/hsqldb/util/JDBCTypes.java
diff --git a/src/org/hsqldb/util/MainInvoker.java b/src/main/java/org/hsqldb/util/MainInvoker.java
similarity index 100%
rename from src/org/hsqldb/util/MainInvoker.java
rename to src/main/java/org/hsqldb/util/MainInvoker.java
diff --git a/src/org/hsqldb/util/McKoiTransferHelper.java b/src/main/java/org/hsqldb/util/McKoiTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/McKoiTransferHelper.java
rename to src/main/java/org/hsqldb/util/McKoiTransferHelper.java
diff --git a/src/org/hsqldb/util/NoWay.gif b/src/main/java/org/hsqldb/util/NoWay.gif
similarity index 100%
rename from src/org/hsqldb/util/NoWay.gif
rename to src/main/java/org/hsqldb/util/NoWay.gif
diff --git a/src/org/hsqldb/util/OracleTransferHelper.java b/src/main/java/org/hsqldb/util/OracleTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/OracleTransferHelper.java
rename to src/main/java/org/hsqldb/util/OracleTransferHelper.java
diff --git a/src/org/hsqldb/util/PostgresTransferHelper.java b/src/main/java/org/hsqldb/util/PostgresTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/PostgresTransferHelper.java
rename to src/main/java/org/hsqldb/util/PostgresTransferHelper.java
diff --git a/src/org/hsqldb/util/RedCircle.gif b/src/main/java/org/hsqldb/util/RedCircle.gif
similarity index 100%
rename from src/org/hsqldb/util/RedCircle.gif
rename to src/main/java/org/hsqldb/util/RedCircle.gif
diff --git a/src/org/hsqldb/util/SQLStatements.java b/src/main/java/org/hsqldb/util/SQLStatements.java
similarity index 100%
rename from src/org/hsqldb/util/SQLStatements.java
rename to src/main/java/org/hsqldb/util/SQLStatements.java
diff --git a/src/org/hsqldb/util/SqlServerTransferHelper.java b/src/main/java/org/hsqldb/util/SqlServerTransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/SqlServerTransferHelper.java
rename to src/main/java/org/hsqldb/util/SqlServerTransferHelper.java
diff --git a/src/org/hsqldb/util/TableSorter.java b/src/main/java/org/hsqldb/util/TableSorter.java
similarity index 100%
rename from src/org/hsqldb/util/TableSorter.java
rename to src/main/java/org/hsqldb/util/TableSorter.java
diff --git a/src/org/hsqldb/util/Traceable.java b/src/main/java/org/hsqldb/util/Traceable.java
similarity index 100%
rename from src/org/hsqldb/util/Traceable.java
rename to src/main/java/org/hsqldb/util/Traceable.java
diff --git a/src/org/hsqldb/util/Transfer.java b/src/main/java/org/hsqldb/util/Transfer.java
similarity index 100%
rename from src/org/hsqldb/util/Transfer.java
rename to src/main/java/org/hsqldb/util/Transfer.java
diff --git a/src/org/hsqldb/util/TransferCommon.java b/src/main/java/org/hsqldb/util/TransferCommon.java
similarity index 100%
rename from src/org/hsqldb/util/TransferCommon.java
rename to src/main/java/org/hsqldb/util/TransferCommon.java
diff --git a/src/org/hsqldb/util/TransferDb.java b/src/main/java/org/hsqldb/util/TransferDb.java
similarity index 100%
rename from src/org/hsqldb/util/TransferDb.java
rename to src/main/java/org/hsqldb/util/TransferDb.java
diff --git a/src/org/hsqldb/util/TransferHelper.java b/src/main/java/org/hsqldb/util/TransferHelper.java
similarity index 100%
rename from src/org/hsqldb/util/TransferHelper.java
rename to src/main/java/org/hsqldb/util/TransferHelper.java
diff --git a/src/org/hsqldb/util/TransferResultSet.java b/src/main/java/org/hsqldb/util/TransferResultSet.java
similarity index 100%
rename from src/org/hsqldb/util/TransferResultSet.java
rename to src/main/java/org/hsqldb/util/TransferResultSet.java
diff --git a/src/org/hsqldb/util/TransferSQLText.java b/src/main/java/org/hsqldb/util/TransferSQLText.java
similarity index 100%
rename from src/org/hsqldb/util/TransferSQLText.java
rename to src/main/java/org/hsqldb/util/TransferSQLText.java
diff --git a/src/org/hsqldb/util/TransferTable.java b/src/main/java/org/hsqldb/util/TransferTable.java
similarity index 100%
rename from src/org/hsqldb/util/TransferTable.java
rename to src/main/java/org/hsqldb/util/TransferTable.java
diff --git a/src/org/hsqldb/util/Tree.java b/src/main/java/org/hsqldb/util/Tree.java
similarity index 100%
rename from src/org/hsqldb/util/Tree.java
rename to src/main/java/org/hsqldb/util/Tree.java
diff --git a/src/org/hsqldb/util/hsqldb.gif b/src/main/java/org/hsqldb/util/hsqldb.gif
similarity index 100%
rename from src/org/hsqldb/util/hsqldb.gif
rename to src/main/java/org/hsqldb/util/hsqldb.gif
diff --git a/src/org/hsqldb/util/hsqldbtab.gif b/src/main/java/org/hsqldb/util/hsqldbtab.gif
similarity index 100%
rename from src/org/hsqldb/util/hsqldbtab.gif
rename to src/main/java/org/hsqldb/util/hsqldbtab.gif
diff --git a/src/org/hsqldb/util/preprocessor/AntResolver.java b/src/main/java/org/hsqldb/util/preprocessor/AntResolver.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/AntResolver.java
rename to src/main/java/org/hsqldb/util/preprocessor/AntResolver.java
diff --git a/src/org/hsqldb/util/preprocessor/BasicResolver.java b/src/main/java/org/hsqldb/util/preprocessor/BasicResolver.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/BasicResolver.java
rename to src/main/java/org/hsqldb/util/preprocessor/BasicResolver.java
diff --git a/src/org/hsqldb/util/preprocessor/Defines.java b/src/main/java/org/hsqldb/util/preprocessor/Defines.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Defines.java
rename to src/main/java/org/hsqldb/util/preprocessor/Defines.java
diff --git a/src/org/hsqldb/util/preprocessor/Document.java b/src/main/java/org/hsqldb/util/preprocessor/Document.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Document.java
rename to src/main/java/org/hsqldb/util/preprocessor/Document.java
diff --git a/src/org/hsqldb/util/preprocessor/IResolver.java b/src/main/java/org/hsqldb/util/preprocessor/IResolver.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/IResolver.java
rename to src/main/java/org/hsqldb/util/preprocessor/IResolver.java
diff --git a/src/org/hsqldb/util/preprocessor/Line.java b/src/main/java/org/hsqldb/util/preprocessor/Line.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Line.java
rename to src/main/java/org/hsqldb/util/preprocessor/Line.java
diff --git a/src/org/hsqldb/util/preprocessor/LineType.java b/src/main/java/org/hsqldb/util/preprocessor/LineType.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/LineType.java
rename to src/main/java/org/hsqldb/util/preprocessor/LineType.java
diff --git a/src/org/hsqldb/util/preprocessor/Option.java b/src/main/java/org/hsqldb/util/preprocessor/Option.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Option.java
rename to src/main/java/org/hsqldb/util/preprocessor/Option.java
diff --git a/src/org/hsqldb/util/preprocessor/Parser.java b/src/main/java/org/hsqldb/util/preprocessor/Parser.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Parser.java
rename to src/main/java/org/hsqldb/util/preprocessor/Parser.java
diff --git a/src/org/hsqldb/util/preprocessor/Preprocessor.java b/src/main/java/org/hsqldb/util/preprocessor/Preprocessor.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Preprocessor.java
rename to src/main/java/org/hsqldb/util/preprocessor/Preprocessor.java
diff --git a/src/org/hsqldb/util/preprocessor/PreprocessorAntTask.java b/src/main/java/org/hsqldb/util/preprocessor/PreprocessorAntTask.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/PreprocessorAntTask.java
rename to src/main/java/org/hsqldb/util/preprocessor/PreprocessorAntTask.java
diff --git a/src/org/hsqldb/util/preprocessor/PreprocessorException.java b/src/main/java/org/hsqldb/util/preprocessor/PreprocessorException.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/PreprocessorException.java
rename to src/main/java/org/hsqldb/util/preprocessor/PreprocessorException.java
diff --git a/src/org/hsqldb/util/preprocessor/Token.java b/src/main/java/org/hsqldb/util/preprocessor/Token.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Token.java
rename to src/main/java/org/hsqldb/util/preprocessor/Token.java
diff --git a/src/org/hsqldb/util/preprocessor/Tokenizer.java b/src/main/java/org/hsqldb/util/preprocessor/Tokenizer.java
similarity index 100%
rename from src/org/hsqldb/util/preprocessor/Tokenizer.java
rename to src/main/java/org/hsqldb/util/preprocessor/Tokenizer.java
diff --git a/src/org/hsqldb/util/problems.gif b/src/main/java/org/hsqldb/util/problems.gif
similarity index 100%
rename from src/org/hsqldb/util/problems.gif
rename to src/main/java/org/hsqldb/util/problems.gif
diff --git a/src/org/hsqldb/util/run_exc.gif b/src/main/java/org/hsqldb/util/run_exc.gif
similarity index 100%
rename from src/org/hsqldb/util/run_exc.gif
rename to src/main/java/org/hsqldb/util/run_exc.gif
diff --git a/src/org/hsqldb/util/run_exc_running.gif b/src/main/java/org/hsqldb/util/run_exc_running.gif
similarity index 100%
rename from src/org/hsqldb/util/run_exc_running.gif
rename to src/main/java/org/hsqldb/util/run_exc_running.gif