diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/.gitignore b/cpp/src/flightsql_odbc/flightsql-odbc/.gitignore similarity index 98% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/.gitignore rename to cpp/src/flightsql_odbc/flightsql-odbc/.gitignore index 3f410c6aa761a..b403ae94223d1 100644 --- a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/.gitignore +++ b/cpp/src/flightsql_odbc/flightsql-odbc/.gitignore @@ -39,4 +39,4 @@ build.* *arrow_odbc_spi_impl_cli *arrow_odbc_spi_impl_test .cmake/ -.cache/ \ No newline at end of file +.cache/ diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/CMakeLists.txt b/cpp/src/flightsql_odbc/flightsql-odbc/CMakeLists.txt similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/CMakeLists.txt rename to cpp/src/flightsql_odbc/flightsql-odbc/CMakeLists.txt diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/LICENSE b/cpp/src/flightsql_odbc/flightsql-odbc/LICENSE similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/LICENSE rename to cpp/src/flightsql_odbc/flightsql-odbc/LICENSE diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/NOTICE b/cpp/src/flightsql_odbc/flightsql-odbc/NOTICE similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/NOTICE rename to cpp/src/flightsql_odbc/flightsql-odbc/NOTICE diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/build_win32.bat b/cpp/src/flightsql_odbc/flightsql-odbc/build_win32.bat similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/build_win32.bat rename to cpp/src/flightsql_odbc/flightsql-odbc/build_win32.bat diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/build_win64.bat b/cpp/src/flightsql_odbc/flightsql-odbc/build_win64.bat similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/build_win64.bat rename to cpp/src/flightsql_odbc/flightsql-odbc/build_win64.bat diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/CMakeLists.txt b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/CMakeLists.txt similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/CMakeLists.txt rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/CMakeLists.txt diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/binary_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/binary_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/boolean_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/boolean_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/common.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/common.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/common.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/common.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/date_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/date_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/decimal_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/decimal_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/main.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/main.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/main.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/main.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/primitive_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/primitive_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/string_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/string_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/time_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/time_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/timestamp_array_accessor_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/types.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/types.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/accessors/types.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/accessors/types.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/address_info.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/address_info.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/address_info.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/address_info.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/address_info.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/address_info.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/address_info.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/address_info.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/config/configuration.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/config/configuration.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/config/configuration.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/config/configuration.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/config/connection_string_parser.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/config/connection_string_parser.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/config/connection_string_parser.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/config/connection_string_parser.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_auth_method.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_auth_method.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_auth_method.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_auth_method.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_auth_method.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_auth_method.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_auth_method.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_auth_method.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_connection_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_connection_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_driver.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_driver.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_driver.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_driver.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_tables_reader.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_get_type_info_reader.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_accessors.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_column.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_column.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_column.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_column.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_column.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_column.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_column.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_column.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_result_set_metadata.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_ssl_config.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_ssl_config.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_ssl_config.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_ssl_config.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_ssl_config.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_ssl_config.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_ssl_config.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_ssl_config.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_columns.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_tables.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_statement_get_type_info.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/flight_sql_stream_chunk_buffer.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/get_info_cache.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/get_info_cache.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/get_info_cache.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/get_info_cache.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/get_info_cache.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/get_info_cache.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/get_info_cache.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/get_info_cache.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/config/configuration.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/config/configuration.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/config/configuration.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/config/configuration.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/config/connection_string_parser.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/config/connection_string_parser.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/config/connection_string_parser.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/config/connection_string_parser.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/flight_sql_driver.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/flight_sql_driver.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/flight_sql_driver.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/flight_sql_driver.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/add_property_window.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/add_property_window.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/add_property_window.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/add_property_window.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/custom_window.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/custom_window.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/custom_window.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/custom_window.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/dsn_configuration_window.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/dsn_configuration_window.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/dsn_configuration_window.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/dsn_configuration_window.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/window.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/window.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/include/flight_sql/ui/window.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/include/flight_sql/ui/window.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/json_converter_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/json_converter_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/main.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/main.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/main.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/main.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/parse_table_types_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/parse_table_types_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/parse_table_types_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/parse_table_types_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/record_batch_transformer_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/record_batch_transformer_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/scalar_function_reporter.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/scalar_function_reporter.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/scalar_function_reporter.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/scalar_function_reporter.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/scalar_function_reporter.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/scalar_function_reporter.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/scalar_function_reporter.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/scalar_function_reporter.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_dsn.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_dsn.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_dsn.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_dsn.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_trust_store.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_trust_store.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_trust_store.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_trust_store.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_trust_store.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_trust_store.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/system_trust_store.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/system_trust_store.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/add_property_window.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/add_property_window.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/add_property_window.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/add_property_window.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/custom_window.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/custom_window.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/custom_window.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/custom_window.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/dsn_configuration_window.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/dsn_configuration_window.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/dsn_configuration_window.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/dsn_configuration_window.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/window.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/window.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/ui/window.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/ui/window.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils.h b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils.h rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils_test.cc b/cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils_test.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/flight_sql/utils_test.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/flight_sql/utils_test.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/.gitignore b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/.gitignore similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/.gitignore rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/.gitignore diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/README.md b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/README.md similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/README.md rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/README.md diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/environment.yml b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/environment.yml similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/environment.yml rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/environment.yml diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/main.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/main.py old mode 100755 new mode 100644 similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/main.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/main.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/requirements.txt b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/requirements.txt similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/requirements.txt rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/requirements.txt diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/__init__.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/__init__.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/__init__.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/__init__.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/test_data_types.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/test_data_types.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/test_data_types.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/test_data_types.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/test_fetch_all.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/test_fetch_all.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_cases/test_fetch_all.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_cases/test_fetch_all.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/__init__.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/__init__.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/__init__.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/__init__.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/base_strategy.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/base_strategy.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/base_strategy.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/base_strategy.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/execution_details.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/execution_details.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/execution_details.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/execution_details.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/pyodbc_strategy.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/pyodbc_strategy.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/pyodbc_strategy.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/pyodbc_strategy.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/turbodbc_strategy.py b/cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/turbodbc_strategy.py similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbc_perf_testing/test_strategy/turbodbc_strategy.py rename to cpp/src/flightsql_odbc/flightsql-odbc/odbc_perf_testing/test_strategy/turbodbc_strategy.py diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/CMakeLists.txt b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/CMakeLists.txt similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/CMakeLists.txt rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/CMakeLists.txt diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/calendar_utils.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/calendar_utils.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/calendar_utils.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/calendar_utils.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/diagnostics.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/diagnostics.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/diagnostics.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/diagnostics.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/encoding.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/encoding.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/encoding.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/encoding.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/exceptions.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/exceptions.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/exceptions.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/exceptions.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/blocking_queue.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/blocking_queue.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/blocking_queue.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/blocking_queue.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/calendar_utils.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/diagnostics.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/diagnostics.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/diagnostics.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/diagnostics.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/encoding.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/encoding.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/encoding.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/encoding.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/error_codes.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/error_codes.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/error_codes.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/error_codes.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/exceptions.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/exceptions.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/exceptions.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/exceptions.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/logger.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/logger.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/logger.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/logger.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/AttributeUtils.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/AttributeUtils.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/AttributeUtils.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/AttributeUtils.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/EncodingUtils.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/EncodingUtils.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/EncodingUtils.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/EncodingUtils.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCConnection.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCConnection.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCConnection.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCConnection.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCDescriptor.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCDescriptor.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCDescriptor.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCDescriptor.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCEnvironment.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCEnvironment.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCEnvironment.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCEnvironment.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCHandle.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCHandle.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCHandle.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCHandle.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCStatement.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCStatement.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCStatement.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/ODBCStatement.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/TypeUtilities.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/TypeUtilities.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/TypeUtilities.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/odbc_impl/TypeUtilities.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/platform.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/platform.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/platform.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/platform.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spd_logger.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spd_logger.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spd_logger.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spd_logger.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/connection.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/connection.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/connection.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/connection.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/driver.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/driver.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/driver.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/driver.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set_metadata.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set_metadata.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set_metadata.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/result_set_metadata.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/statement.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/statement.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/statement.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/spi/statement.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/types.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/types.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/types.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/types.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/utils.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/utils.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/include/odbcabstraction/utils.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/include/odbcabstraction/utils.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/logger.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/logger.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/logger.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/logger.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCConnection.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCConnection.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCConnection.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCConnection.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCDescriptor.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCDescriptor.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCDescriptor.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCDescriptor.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCEnvironment.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCEnvironment.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCEnvironment.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCEnvironment.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCStatement.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCStatement.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/odbc_impl/ODBCStatement.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/odbc_impl/ODBCStatement.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/spd_logger.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/spd_logger.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/spd_logger.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/spd_logger.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/utils.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/utils.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/utils.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/utils.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/whereami.cc b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/whereami.cc similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/whereami.cc rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/whereami.cc diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/whereami.h b/cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/whereami.h similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/odbcabstraction/whereami.h rename to cpp/src/flightsql_odbc/flightsql-odbc/odbcabstraction/whereami.h diff --git a/flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/vcpkg.json b/cpp/src/flightsql_odbc/flightsql-odbc/vcpkg.json similarity index 100% rename from flightsql-odbc/flightsql-odbc/flightsql-odbc-clone/flightsql-odbc/vcpkg.json rename to cpp/src/flightsql_odbc/flightsql-odbc/vcpkg.json