diff --git a/CHANGELOG.md b/pgtype/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to pgtype/CHANGELOG.md
diff --git a/LICENSE b/pgtype/LICENSE
similarity index 100%
rename from LICENSE
rename to pgtype/LICENSE
diff --git a/README.md b/pgtype/README.md
similarity index 100%
rename from README.md
rename to pgtype/README.md
diff --git a/aclitem.go b/pgtype/aclitem.go
similarity index 100%
rename from aclitem.go
rename to pgtype/aclitem.go
diff --git a/aclitem_array.go b/pgtype/aclitem_array.go
similarity index 100%
rename from aclitem_array.go
rename to pgtype/aclitem_array.go
diff --git a/aclitem_array_test.go b/pgtype/aclitem_array_test.go
similarity index 100%
rename from aclitem_array_test.go
rename to pgtype/aclitem_array_test.go
diff --git a/aclitem_test.go b/pgtype/aclitem_test.go
similarity index 100%
rename from aclitem_test.go
rename to pgtype/aclitem_test.go
diff --git a/array.go b/pgtype/array.go
similarity index 100%
rename from array.go
rename to pgtype/array.go
diff --git a/array_test.go b/pgtype/array_test.go
similarity index 100%
rename from array_test.go
rename to pgtype/array_test.go
diff --git a/array_type.go b/pgtype/array_type.go
similarity index 100%
rename from array_type.go
rename to pgtype/array_type.go
diff --git a/array_type_test.go b/pgtype/array_type_test.go
similarity index 100%
rename from array_type_test.go
rename to pgtype/array_type_test.go
diff --git a/bit.go b/pgtype/bit.go
similarity index 100%
rename from bit.go
rename to pgtype/bit.go
diff --git a/bit_test.go b/pgtype/bit_test.go
similarity index 100%
rename from bit_test.go
rename to pgtype/bit_test.go
diff --git a/bool.go b/pgtype/bool.go
similarity index 100%
rename from bool.go
rename to pgtype/bool.go
diff --git a/bool_array.go b/pgtype/bool_array.go
similarity index 100%
rename from bool_array.go
rename to pgtype/bool_array.go
diff --git a/bool_array_test.go b/pgtype/bool_array_test.go
similarity index 100%
rename from bool_array_test.go
rename to pgtype/bool_array_test.go
diff --git a/bool_test.go b/pgtype/bool_test.go
similarity index 100%
rename from bool_test.go
rename to pgtype/bool_test.go
diff --git a/box.go b/pgtype/box.go
similarity index 100%
rename from box.go
rename to pgtype/box.go
diff --git a/box_test.go b/pgtype/box_test.go
similarity index 100%
rename from box_test.go
rename to pgtype/box_test.go
diff --git a/bpchar.go b/pgtype/bpchar.go
similarity index 100%
rename from bpchar.go
rename to pgtype/bpchar.go
diff --git a/bpchar_array.go b/pgtype/bpchar_array.go
similarity index 100%
rename from bpchar_array.go
rename to pgtype/bpchar_array.go
diff --git a/bpchar_array_test.go b/pgtype/bpchar_array_test.go
similarity index 100%
rename from bpchar_array_test.go
rename to pgtype/bpchar_array_test.go
diff --git a/bpchar_test.go b/pgtype/bpchar_test.go
similarity index 100%
rename from bpchar_test.go
rename to pgtype/bpchar_test.go
diff --git a/bytea.go b/pgtype/bytea.go
similarity index 100%
rename from bytea.go
rename to pgtype/bytea.go
diff --git a/bytea_array.go b/pgtype/bytea_array.go
similarity index 100%
rename from bytea_array.go
rename to pgtype/bytea_array.go
diff --git a/bytea_array_test.go b/pgtype/bytea_array_test.go
similarity index 100%
rename from bytea_array_test.go
rename to pgtype/bytea_array_test.go
diff --git a/bytea_test.go b/pgtype/bytea_test.go
similarity index 100%
rename from bytea_test.go
rename to pgtype/bytea_test.go
diff --git a/cid.go b/pgtype/cid.go
similarity index 100%
rename from cid.go
rename to pgtype/cid.go
diff --git a/cid_test.go b/pgtype/cid_test.go
similarity index 100%
rename from cid_test.go
rename to pgtype/cid_test.go
diff --git a/cidr.go b/pgtype/cidr.go
similarity index 100%
rename from cidr.go
rename to pgtype/cidr.go
diff --git a/cidr_array.go b/pgtype/cidr_array.go
similarity index 100%
rename from cidr_array.go
rename to pgtype/cidr_array.go
diff --git a/cidr_array_test.go b/pgtype/cidr_array_test.go
similarity index 100%
rename from cidr_array_test.go
rename to pgtype/cidr_array_test.go
diff --git a/circle.go b/pgtype/circle.go
similarity index 100%
rename from circle.go
rename to pgtype/circle.go
diff --git a/circle_test.go b/pgtype/circle_test.go
similarity index 100%
rename from circle_test.go
rename to pgtype/circle_test.go
diff --git a/composite_bench_test.go b/pgtype/composite_bench_test.go
similarity index 100%
rename from composite_bench_test.go
rename to pgtype/composite_bench_test.go
diff --git a/composite_fields.go b/pgtype/composite_fields.go
similarity index 100%
rename from composite_fields.go
rename to pgtype/composite_fields.go
diff --git a/composite_fields_test.go b/pgtype/composite_fields_test.go
similarity index 100%
rename from composite_fields_test.go
rename to pgtype/composite_fields_test.go
diff --git a/composite_type.go b/pgtype/composite_type.go
similarity index 100%
rename from composite_type.go
rename to pgtype/composite_type.go
diff --git a/composite_type_test.go b/pgtype/composite_type_test.go
similarity index 100%
rename from composite_type_test.go
rename to pgtype/composite_type_test.go
diff --git a/convert.go b/pgtype/convert.go
similarity index 100%
rename from convert.go
rename to pgtype/convert.go
diff --git a/custom_composite_test.go b/pgtype/custom_composite_test.go
similarity index 100%
rename from custom_composite_test.go
rename to pgtype/custom_composite_test.go
diff --git a/database_sql.go b/pgtype/database_sql.go
similarity index 100%
rename from database_sql.go
rename to pgtype/database_sql.go
diff --git a/date.go b/pgtype/date.go
similarity index 100%
rename from date.go
rename to pgtype/date.go
diff --git a/date_array.go b/pgtype/date_array.go
similarity index 100%
rename from date_array.go
rename to pgtype/date_array.go
diff --git a/date_array_test.go b/pgtype/date_array_test.go
similarity index 100%
rename from date_array_test.go
rename to pgtype/date_array_test.go
diff --git a/date_test.go b/pgtype/date_test.go
similarity index 100%
rename from date_test.go
rename to pgtype/date_test.go
diff --git a/daterange.go b/pgtype/daterange.go
similarity index 100%
rename from daterange.go
rename to pgtype/daterange.go
diff --git a/daterange_test.go b/pgtype/daterange_test.go
similarity index 100%
rename from daterange_test.go
rename to pgtype/daterange_test.go
diff --git a/enum_array.go b/pgtype/enum_array.go
similarity index 100%
rename from enum_array.go
rename to pgtype/enum_array.go
diff --git a/enum_array_test.go b/pgtype/enum_array_test.go
similarity index 100%
rename from enum_array_test.go
rename to pgtype/enum_array_test.go
diff --git a/enum_type.go b/pgtype/enum_type.go
similarity index 100%
rename from enum_type.go
rename to pgtype/enum_type.go
diff --git a/enum_type_test.go b/pgtype/enum_type_test.go
similarity index 100%
rename from enum_type_test.go
rename to pgtype/enum_type_test.go
diff --git a/float4.go b/pgtype/float4.go
similarity index 100%
rename from float4.go
rename to pgtype/float4.go
diff --git a/float4_array.go b/pgtype/float4_array.go
similarity index 100%
rename from float4_array.go
rename to pgtype/float4_array.go
diff --git a/float4_array_test.go b/pgtype/float4_array_test.go
similarity index 100%
rename from float4_array_test.go
rename to pgtype/float4_array_test.go
diff --git a/float4_test.go b/pgtype/float4_test.go
similarity index 100%
rename from float4_test.go
rename to pgtype/float4_test.go
diff --git a/float8.go b/pgtype/float8.go
similarity index 100%
rename from float8.go
rename to pgtype/float8.go
diff --git a/float8_array.go b/pgtype/float8_array.go
similarity index 100%
rename from float8_array.go
rename to pgtype/float8_array.go
diff --git a/float8_array_test.go b/pgtype/float8_array_test.go
similarity index 100%
rename from float8_array_test.go
rename to pgtype/float8_array_test.go
diff --git a/float8_test.go b/pgtype/float8_test.go
similarity index 100%
rename from float8_test.go
rename to pgtype/float8_test.go
diff --git a/generic_binary.go b/pgtype/generic_binary.go
similarity index 100%
rename from generic_binary.go
rename to pgtype/generic_binary.go
diff --git a/generic_text.go b/pgtype/generic_text.go
similarity index 100%
rename from generic_text.go
rename to pgtype/generic_text.go
diff --git a/go.mod b/pgtype/go.mod
similarity index 100%
rename from go.mod
rename to pgtype/go.mod
diff --git a/go.sum b/pgtype/go.sum
similarity index 100%
rename from go.sum
rename to pgtype/go.sum
diff --git a/hstore.go b/pgtype/hstore.go
similarity index 100%
rename from hstore.go
rename to pgtype/hstore.go
diff --git a/hstore_array.go b/pgtype/hstore_array.go
similarity index 100%
rename from hstore_array.go
rename to pgtype/hstore_array.go
diff --git a/hstore_array_test.go b/pgtype/hstore_array_test.go
similarity index 100%
rename from hstore_array_test.go
rename to pgtype/hstore_array_test.go
diff --git a/hstore_test.go b/pgtype/hstore_test.go
similarity index 100%
rename from hstore_test.go
rename to pgtype/hstore_test.go
diff --git a/inet.go b/pgtype/inet.go
similarity index 100%
rename from inet.go
rename to pgtype/inet.go
diff --git a/inet_array.go b/pgtype/inet_array.go
similarity index 100%
rename from inet_array.go
rename to pgtype/inet_array.go
diff --git a/inet_array_test.go b/pgtype/inet_array_test.go
similarity index 100%
rename from inet_array_test.go
rename to pgtype/inet_array_test.go
diff --git a/inet_test.go b/pgtype/inet_test.go
similarity index 100%
rename from inet_test.go
rename to pgtype/inet_test.go
diff --git a/int2.go b/pgtype/int2.go
similarity index 100%
rename from int2.go
rename to pgtype/int2.go
diff --git a/int2_array.go b/pgtype/int2_array.go
similarity index 100%
rename from int2_array.go
rename to pgtype/int2_array.go
diff --git a/int2_array_test.go b/pgtype/int2_array_test.go
similarity index 100%
rename from int2_array_test.go
rename to pgtype/int2_array_test.go
diff --git a/int2_test.go b/pgtype/int2_test.go
similarity index 100%
rename from int2_test.go
rename to pgtype/int2_test.go
diff --git a/int4.go b/pgtype/int4.go
similarity index 100%
rename from int4.go
rename to pgtype/int4.go
diff --git a/int4_array.go b/pgtype/int4_array.go
similarity index 100%
rename from int4_array.go
rename to pgtype/int4_array.go
diff --git a/int4_array_test.go b/pgtype/int4_array_test.go
similarity index 100%
rename from int4_array_test.go
rename to pgtype/int4_array_test.go
diff --git a/int4_test.go b/pgtype/int4_test.go
similarity index 100%
rename from int4_test.go
rename to pgtype/int4_test.go
diff --git a/int4range.go b/pgtype/int4range.go
similarity index 100%
rename from int4range.go
rename to pgtype/int4range.go
diff --git a/int4range_test.go b/pgtype/int4range_test.go
similarity index 100%
rename from int4range_test.go
rename to pgtype/int4range_test.go
diff --git a/int8.go b/pgtype/int8.go
similarity index 100%
rename from int8.go
rename to pgtype/int8.go
diff --git a/int8_array.go b/pgtype/int8_array.go
similarity index 100%
rename from int8_array.go
rename to pgtype/int8_array.go
diff --git a/int8_array_test.go b/pgtype/int8_array_test.go
similarity index 100%
rename from int8_array_test.go
rename to pgtype/int8_array_test.go
diff --git a/int8_test.go b/pgtype/int8_test.go
similarity index 100%
rename from int8_test.go
rename to pgtype/int8_test.go
diff --git a/int8range.go b/pgtype/int8range.go
similarity index 100%
rename from int8range.go
rename to pgtype/int8range.go
diff --git a/int8range_test.go b/pgtype/int8range_test.go
similarity index 100%
rename from int8range_test.go
rename to pgtype/int8range_test.go
diff --git a/integration_benchmark_test.go b/pgtype/integration_benchmark_test.go
similarity index 100%
rename from integration_benchmark_test.go
rename to pgtype/integration_benchmark_test.go
diff --git a/integration_benchmark_test.go.erb b/pgtype/integration_benchmark_test.go.erb
similarity index 100%
rename from integration_benchmark_test.go.erb
rename to pgtype/integration_benchmark_test.go.erb
diff --git a/integration_benchmark_test_gen.sh b/pgtype/integration_benchmark_test_gen.sh
similarity index 100%
rename from integration_benchmark_test_gen.sh
rename to pgtype/integration_benchmark_test_gen.sh
diff --git a/interval.go b/pgtype/interval.go
similarity index 100%
rename from interval.go
rename to pgtype/interval.go
diff --git a/interval_test.go b/pgtype/interval_test.go
similarity index 100%
rename from interval_test.go
rename to pgtype/interval_test.go
diff --git a/json.go b/pgtype/json.go
similarity index 100%
rename from json.go
rename to pgtype/json.go
diff --git a/json_test.go b/pgtype/json_test.go
similarity index 100%
rename from json_test.go
rename to pgtype/json_test.go
diff --git a/jsonb.go b/pgtype/jsonb.go
similarity index 100%
rename from jsonb.go
rename to pgtype/jsonb.go
diff --git a/jsonb_array.go b/pgtype/jsonb_array.go
similarity index 100%
rename from jsonb_array.go
rename to pgtype/jsonb_array.go
diff --git a/jsonb_array_test.go b/pgtype/jsonb_array_test.go
similarity index 100%
rename from jsonb_array_test.go
rename to pgtype/jsonb_array_test.go
diff --git a/jsonb_test.go b/pgtype/jsonb_test.go
similarity index 100%
rename from jsonb_test.go
rename to pgtype/jsonb_test.go
diff --git a/line.go b/pgtype/line.go
similarity index 100%
rename from line.go
rename to pgtype/line.go
diff --git a/line_test.go b/pgtype/line_test.go
similarity index 100%
rename from line_test.go
rename to pgtype/line_test.go
diff --git a/lseg.go b/pgtype/lseg.go
similarity index 100%
rename from lseg.go
rename to pgtype/lseg.go
diff --git a/lseg_test.go b/pgtype/lseg_test.go
similarity index 100%
rename from lseg_test.go
rename to pgtype/lseg_test.go
diff --git a/macaddr.go b/pgtype/macaddr.go
similarity index 100%
rename from macaddr.go
rename to pgtype/macaddr.go
diff --git a/macaddr_array.go b/pgtype/macaddr_array.go
similarity index 100%
rename from macaddr_array.go
rename to pgtype/macaddr_array.go
diff --git a/macaddr_array_test.go b/pgtype/macaddr_array_test.go
similarity index 100%
rename from macaddr_array_test.go
rename to pgtype/macaddr_array_test.go
diff --git a/macaddr_test.go b/pgtype/macaddr_test.go
similarity index 100%
rename from macaddr_test.go
rename to pgtype/macaddr_test.go
diff --git a/name.go b/pgtype/name.go
similarity index 100%
rename from name.go
rename to pgtype/name.go
diff --git a/name_test.go b/pgtype/name_test.go
similarity index 100%
rename from name_test.go
rename to pgtype/name_test.go
diff --git a/new_pg_value.erb b/pgtype/new_pg_value.erb
similarity index 100%
rename from new_pg_value.erb
rename to pgtype/new_pg_value.erb
diff --git a/new_pg_value_gen.sh b/pgtype/new_pg_value_gen.sh
similarity index 100%
rename from new_pg_value_gen.sh
rename to pgtype/new_pg_value_gen.sh
diff --git a/numeric.go b/pgtype/numeric.go
similarity index 100%
rename from numeric.go
rename to pgtype/numeric.go
diff --git a/numeric_array.go b/pgtype/numeric_array.go
similarity index 100%
rename from numeric_array.go
rename to pgtype/numeric_array.go
diff --git a/numeric_array_test.go b/pgtype/numeric_array_test.go
similarity index 100%
rename from numeric_array_test.go
rename to pgtype/numeric_array_test.go
diff --git a/numeric_test.go b/pgtype/numeric_test.go
similarity index 100%
rename from numeric_test.go
rename to pgtype/numeric_test.go
diff --git a/numrange.go b/pgtype/numrange.go
similarity index 100%
rename from numrange.go
rename to pgtype/numrange.go
diff --git a/numrange_test.go b/pgtype/numrange_test.go
similarity index 100%
rename from numrange_test.go
rename to pgtype/numrange_test.go
diff --git a/oid.go b/pgtype/oid.go
similarity index 100%
rename from oid.go
rename to pgtype/oid.go
diff --git a/oid_value.go b/pgtype/oid_value.go
similarity index 100%
rename from oid_value.go
rename to pgtype/oid_value.go
diff --git a/oid_value_test.go b/pgtype/oid_value_test.go
similarity index 100%
rename from oid_value_test.go
rename to pgtype/oid_value_test.go
diff --git a/path.go b/pgtype/path.go
similarity index 100%
rename from path.go
rename to pgtype/path.go
diff --git a/path_test.go b/pgtype/path_test.go
similarity index 100%
rename from path_test.go
rename to pgtype/path_test.go
diff --git a/pgtype.go b/pgtype/pgtype.go
similarity index 100%
rename from pgtype.go
rename to pgtype/pgtype.go
diff --git a/pgtype_test.go b/pgtype/pgtype_test.go
similarity index 100%
rename from pgtype_test.go
rename to pgtype/pgtype_test.go
diff --git a/pguint32.go b/pgtype/pguint32.go
similarity index 100%
rename from pguint32.go
rename to pgtype/pguint32.go
diff --git a/pgxtype/README.md b/pgtype/pgxtype/README.md
similarity index 100%
rename from pgxtype/README.md
rename to pgtype/pgxtype/README.md
diff --git a/pgxtype/pgxtype.go b/pgtype/pgxtype/pgxtype.go
similarity index 100%
rename from pgxtype/pgxtype.go
rename to pgtype/pgxtype/pgxtype.go
diff --git a/point.go b/pgtype/point.go
similarity index 100%
rename from point.go
rename to pgtype/point.go
diff --git a/point_test.go b/pgtype/point_test.go
similarity index 100%
rename from point_test.go
rename to pgtype/point_test.go
diff --git a/polygon.go b/pgtype/polygon.go
similarity index 100%
rename from polygon.go
rename to pgtype/polygon.go
diff --git a/polygon_test.go b/pgtype/polygon_test.go
similarity index 100%
rename from polygon_test.go
rename to pgtype/polygon_test.go
diff --git a/qchar.go b/pgtype/qchar.go
similarity index 100%
rename from qchar.go
rename to pgtype/qchar.go
diff --git a/qchar_test.go b/pgtype/qchar_test.go
similarity index 100%
rename from qchar_test.go
rename to pgtype/qchar_test.go
diff --git a/range.go b/pgtype/range.go
similarity index 100%
rename from range.go
rename to pgtype/range.go
diff --git a/range_test.go b/pgtype/range_test.go
similarity index 100%
rename from range_test.go
rename to pgtype/range_test.go
diff --git a/record.go b/pgtype/record.go
similarity index 100%
rename from record.go
rename to pgtype/record.go
diff --git a/record_test.go b/pgtype/record_test.go
similarity index 100%
rename from record_test.go
rename to pgtype/record_test.go
diff --git a/testutil/testutil.go b/pgtype/testutil/testutil.go
similarity index 100%
rename from testutil/testutil.go
rename to pgtype/testutil/testutil.go
diff --git a/text.go b/pgtype/text.go
similarity index 100%
rename from text.go
rename to pgtype/text.go
diff --git a/text_array.go b/pgtype/text_array.go
similarity index 100%
rename from text_array.go
rename to pgtype/text_array.go
diff --git a/text_array_test.go b/pgtype/text_array_test.go
similarity index 100%
rename from text_array_test.go
rename to pgtype/text_array_test.go
diff --git a/text_test.go b/pgtype/text_test.go
similarity index 100%
rename from text_test.go
rename to pgtype/text_test.go
diff --git a/tid.go b/pgtype/tid.go
similarity index 100%
rename from tid.go
rename to pgtype/tid.go
diff --git a/tid_test.go b/pgtype/tid_test.go
similarity index 100%
rename from tid_test.go
rename to pgtype/tid_test.go
diff --git a/time.go b/pgtype/time.go
similarity index 100%
rename from time.go
rename to pgtype/time.go
diff --git a/time_test.go b/pgtype/time_test.go
similarity index 100%
rename from time_test.go
rename to pgtype/time_test.go
diff --git a/timestamp.go b/pgtype/timestamp.go
similarity index 100%
rename from timestamp.go
rename to pgtype/timestamp.go
diff --git a/timestamp_array.go b/pgtype/timestamp_array.go
similarity index 100%
rename from timestamp_array.go
rename to pgtype/timestamp_array.go
diff --git a/timestamp_array_test.go b/pgtype/timestamp_array_test.go
similarity index 100%
rename from timestamp_array_test.go
rename to pgtype/timestamp_array_test.go
diff --git a/timestamp_test.go b/pgtype/timestamp_test.go
similarity index 100%
rename from timestamp_test.go
rename to pgtype/timestamp_test.go
diff --git a/timestamptz.go b/pgtype/timestamptz.go
similarity index 100%
rename from timestamptz.go
rename to pgtype/timestamptz.go
diff --git a/timestamptz_array.go b/pgtype/timestamptz_array.go
similarity index 100%
rename from timestamptz_array.go
rename to pgtype/timestamptz_array.go
diff --git a/timestamptz_array_test.go b/pgtype/timestamptz_array_test.go
similarity index 100%
rename from timestamptz_array_test.go
rename to pgtype/timestamptz_array_test.go
diff --git a/timestamptz_test.go b/pgtype/timestamptz_test.go
similarity index 100%
rename from timestamptz_test.go
rename to pgtype/timestamptz_test.go
diff --git a/tsrange.go b/pgtype/tsrange.go
similarity index 100%
rename from tsrange.go
rename to pgtype/tsrange.go
diff --git a/tsrange_array.go b/pgtype/tsrange_array.go
similarity index 100%
rename from tsrange_array.go
rename to pgtype/tsrange_array.go
diff --git a/tsrange_test.go b/pgtype/tsrange_test.go
similarity index 100%
rename from tsrange_test.go
rename to pgtype/tsrange_test.go
diff --git a/tstzrange.go b/pgtype/tstzrange.go
similarity index 100%
rename from tstzrange.go
rename to pgtype/tstzrange.go
diff --git a/tstzrange_array.go b/pgtype/tstzrange_array.go
similarity index 100%
rename from tstzrange_array.go
rename to pgtype/tstzrange_array.go
diff --git a/tstzrange_test.go b/pgtype/tstzrange_test.go
similarity index 100%
rename from tstzrange_test.go
rename to pgtype/tstzrange_test.go
diff --git a/typed_array.go.erb b/pgtype/typed_array.go.erb
similarity index 100%
rename from typed_array.go.erb
rename to pgtype/typed_array.go.erb
diff --git a/typed_array_gen.sh b/pgtype/typed_array_gen.sh
similarity index 100%
rename from typed_array_gen.sh
rename to pgtype/typed_array_gen.sh
diff --git a/typed_range.go.erb b/pgtype/typed_range.go.erb
similarity index 100%
rename from typed_range.go.erb
rename to pgtype/typed_range.go.erb
diff --git a/typed_range_gen.sh b/pgtype/typed_range_gen.sh
similarity index 100%
rename from typed_range_gen.sh
rename to pgtype/typed_range_gen.sh
diff --git a/unknown.go b/pgtype/unknown.go
similarity index 100%
rename from unknown.go
rename to pgtype/unknown.go
diff --git a/uuid.go b/pgtype/uuid.go
similarity index 100%
rename from uuid.go
rename to pgtype/uuid.go
diff --git a/uuid_array.go b/pgtype/uuid_array.go
similarity index 100%
rename from uuid_array.go
rename to pgtype/uuid_array.go
diff --git a/uuid_array_test.go b/pgtype/uuid_array_test.go
similarity index 100%
rename from uuid_array_test.go
rename to pgtype/uuid_array_test.go
diff --git a/uuid_test.go b/pgtype/uuid_test.go
similarity index 100%
rename from uuid_test.go
rename to pgtype/uuid_test.go
diff --git a/varbit.go b/pgtype/varbit.go
similarity index 100%
rename from varbit.go
rename to pgtype/varbit.go
diff --git a/varbit_test.go b/pgtype/varbit_test.go
similarity index 100%
rename from varbit_test.go
rename to pgtype/varbit_test.go
diff --git a/varchar.go b/pgtype/varchar.go
similarity index 100%
rename from varchar.go
rename to pgtype/varchar.go
diff --git a/varchar_array.go b/pgtype/varchar_array.go
similarity index 100%
rename from varchar_array.go
rename to pgtype/varchar_array.go
diff --git a/varchar_array_test.go b/pgtype/varchar_array_test.go
similarity index 100%
rename from varchar_array_test.go
rename to pgtype/varchar_array_test.go
diff --git a/.github/workflows/ci.yml b/pgtype/workflows/ci.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to pgtype/workflows/ci.yml
diff --git a/xid.go b/pgtype/xid.go
similarity index 100%
rename from xid.go
rename to pgtype/xid.go
diff --git a/xid_test.go b/pgtype/xid_test.go
similarity index 100%
rename from xid_test.go
rename to pgtype/xid_test.go
diff --git a/zeronull/doc.go b/pgtype/zeronull/doc.go
similarity index 100%
rename from zeronull/doc.go
rename to pgtype/zeronull/doc.go
diff --git a/zeronull/float8.go b/pgtype/zeronull/float8.go
similarity index 100%
rename from zeronull/float8.go
rename to pgtype/zeronull/float8.go
diff --git a/zeronull/float8_test.go b/pgtype/zeronull/float8_test.go
similarity index 100%
rename from zeronull/float8_test.go
rename to pgtype/zeronull/float8_test.go
diff --git a/zeronull/int2.go b/pgtype/zeronull/int2.go
similarity index 100%
rename from zeronull/int2.go
rename to pgtype/zeronull/int2.go
diff --git a/zeronull/int2_test.go b/pgtype/zeronull/int2_test.go
similarity index 100%
rename from zeronull/int2_test.go
rename to pgtype/zeronull/int2_test.go
diff --git a/zeronull/int4.go b/pgtype/zeronull/int4.go
similarity index 100%
rename from zeronull/int4.go
rename to pgtype/zeronull/int4.go
diff --git a/zeronull/int4_test.go b/pgtype/zeronull/int4_test.go
similarity index 100%
rename from zeronull/int4_test.go
rename to pgtype/zeronull/int4_test.go
diff --git a/zeronull/int8.go b/pgtype/zeronull/int8.go
similarity index 100%
rename from zeronull/int8.go
rename to pgtype/zeronull/int8.go
diff --git a/zeronull/int8_test.go b/pgtype/zeronull/int8_test.go
similarity index 100%
rename from zeronull/int8_test.go
rename to pgtype/zeronull/int8_test.go
diff --git a/zeronull/text.go b/pgtype/zeronull/text.go
similarity index 100%
rename from zeronull/text.go
rename to pgtype/zeronull/text.go
diff --git a/zeronull/text_test.go b/pgtype/zeronull/text_test.go
similarity index 100%
rename from zeronull/text_test.go
rename to pgtype/zeronull/text_test.go
diff --git a/zeronull/timestamp.go b/pgtype/zeronull/timestamp.go
similarity index 100%
rename from zeronull/timestamp.go
rename to pgtype/zeronull/timestamp.go
diff --git a/zeronull/timestamp_test.go b/pgtype/zeronull/timestamp_test.go
similarity index 100%
rename from zeronull/timestamp_test.go
rename to pgtype/zeronull/timestamp_test.go
diff --git a/zeronull/timestamptz.go b/pgtype/zeronull/timestamptz.go
similarity index 100%
rename from zeronull/timestamptz.go
rename to pgtype/zeronull/timestamptz.go
diff --git a/zeronull/timestamptz_test.go b/pgtype/zeronull/timestamptz_test.go
similarity index 100%
rename from zeronull/timestamptz_test.go
rename to pgtype/zeronull/timestamptz_test.go
diff --git a/zeronull/uuid.go b/pgtype/zeronull/uuid.go
similarity index 100%
rename from zeronull/uuid.go
rename to pgtype/zeronull/uuid.go
diff --git a/zeronull/uuid_test.go b/pgtype/zeronull/uuid_test.go
similarity index 100%
rename from zeronull/uuid_test.go
rename to pgtype/zeronull/uuid_test.go
diff --git a/zzz.aclitem.go b/pgtype/zzz.aclitem.go
similarity index 100%
rename from zzz.aclitem.go
rename to pgtype/zzz.aclitem.go
diff --git a/zzz.bit.go b/pgtype/zzz.bit.go
similarity index 100%
rename from zzz.bit.go
rename to pgtype/zzz.bit.go
diff --git a/zzz.bool.go b/pgtype/zzz.bool.go
similarity index 100%
rename from zzz.bool.go
rename to pgtype/zzz.bool.go
diff --git a/zzz.box.go b/pgtype/zzz.box.go
similarity index 100%
rename from zzz.box.go
rename to pgtype/zzz.box.go
diff --git a/zzz.bpchar.go b/pgtype/zzz.bpchar.go
similarity index 100%
rename from zzz.bpchar.go
rename to pgtype/zzz.bpchar.go
diff --git a/zzz.bytea.go b/pgtype/zzz.bytea.go
similarity index 100%
rename from zzz.bytea.go
rename to pgtype/zzz.bytea.go
diff --git a/zzz.cid.go b/pgtype/zzz.cid.go
similarity index 100%
rename from zzz.cid.go
rename to pgtype/zzz.cid.go
diff --git a/zzz.cidr.go b/pgtype/zzz.cidr.go
similarity index 100%
rename from zzz.cidr.go
rename to pgtype/zzz.cidr.go
diff --git a/zzz.circle.go b/pgtype/zzz.circle.go
similarity index 100%
rename from zzz.circle.go
rename to pgtype/zzz.circle.go
diff --git a/zzz.date.go b/pgtype/zzz.date.go
similarity index 100%
rename from zzz.date.go
rename to pgtype/zzz.date.go
diff --git a/zzz.float4.go b/pgtype/zzz.float4.go
similarity index 100%
rename from zzz.float4.go
rename to pgtype/zzz.float4.go
diff --git a/zzz.float8.go b/pgtype/zzz.float8.go
similarity index 100%
rename from zzz.float8.go
rename to pgtype/zzz.float8.go
diff --git a/zzz.generic_binary.go b/pgtype/zzz.generic_binary.go
similarity index 100%
rename from zzz.generic_binary.go
rename to pgtype/zzz.generic_binary.go
diff --git a/zzz.generic_text.go b/pgtype/zzz.generic_text.go
similarity index 100%
rename from zzz.generic_text.go
rename to pgtype/zzz.generic_text.go
diff --git a/zzz.hstore.go b/pgtype/zzz.hstore.go
similarity index 100%
rename from zzz.hstore.go
rename to pgtype/zzz.hstore.go
diff --git a/zzz.inet.go b/pgtype/zzz.inet.go
similarity index 100%
rename from zzz.inet.go
rename to pgtype/zzz.inet.go
diff --git a/zzz.int2.go b/pgtype/zzz.int2.go
similarity index 100%
rename from zzz.int2.go
rename to pgtype/zzz.int2.go
diff --git a/zzz.int4.go b/pgtype/zzz.int4.go
similarity index 100%
rename from zzz.int4.go
rename to pgtype/zzz.int4.go
diff --git a/zzz.int8.go b/pgtype/zzz.int8.go
similarity index 100%
rename from zzz.int8.go
rename to pgtype/zzz.int8.go
diff --git a/zzz.interval.go b/pgtype/zzz.interval.go
similarity index 100%
rename from zzz.interval.go
rename to pgtype/zzz.interval.go
diff --git a/zzz.json.go b/pgtype/zzz.json.go
similarity index 100%
rename from zzz.json.go
rename to pgtype/zzz.json.go
diff --git a/zzz.jsonb.go b/pgtype/zzz.jsonb.go
similarity index 100%
rename from zzz.jsonb.go
rename to pgtype/zzz.jsonb.go
diff --git a/zzz.line.go b/pgtype/zzz.line.go
similarity index 100%
rename from zzz.line.go
rename to pgtype/zzz.line.go
diff --git a/zzz.lseg.go b/pgtype/zzz.lseg.go
similarity index 100%
rename from zzz.lseg.go
rename to pgtype/zzz.lseg.go
diff --git a/zzz.macadder.go b/pgtype/zzz.macadder.go
similarity index 100%
rename from zzz.macadder.go
rename to pgtype/zzz.macadder.go
diff --git a/zzz.name.go b/pgtype/zzz.name.go
similarity index 100%
rename from zzz.name.go
rename to pgtype/zzz.name.go
diff --git a/zzz.numeric.go b/pgtype/zzz.numeric.go
similarity index 100%
rename from zzz.numeric.go
rename to pgtype/zzz.numeric.go
diff --git a/zzz.oid.go b/pgtype/zzz.oid.go
similarity index 100%
rename from zzz.oid.go
rename to pgtype/zzz.oid.go
diff --git a/zzz.oid_value.go b/pgtype/zzz.oid_value.go
similarity index 100%
rename from zzz.oid_value.go
rename to pgtype/zzz.oid_value.go
diff --git a/zzz.path.go b/pgtype/zzz.path.go
similarity index 100%
rename from zzz.path.go
rename to pgtype/zzz.path.go
diff --git a/zzz.pguint32.go b/pgtype/zzz.pguint32.go
similarity index 100%
rename from zzz.pguint32.go
rename to pgtype/zzz.pguint32.go
diff --git a/zzz.point.go b/pgtype/zzz.point.go
similarity index 100%
rename from zzz.point.go
rename to pgtype/zzz.point.go
diff --git a/zzz.polygon.go b/pgtype/zzz.polygon.go
similarity index 100%
rename from zzz.polygon.go
rename to pgtype/zzz.polygon.go
diff --git a/zzz.qchar.go b/pgtype/zzz.qchar.go
similarity index 100%
rename from zzz.qchar.go
rename to pgtype/zzz.qchar.go
diff --git a/zzz.text.go b/pgtype/zzz.text.go
similarity index 100%
rename from zzz.text.go
rename to pgtype/zzz.text.go
diff --git a/zzz.tid.go b/pgtype/zzz.tid.go
similarity index 100%
rename from zzz.tid.go
rename to pgtype/zzz.tid.go
diff --git a/zzz.time.go b/pgtype/zzz.time.go
similarity index 100%
rename from zzz.time.go
rename to pgtype/zzz.time.go
diff --git a/zzz.timestamp.go b/pgtype/zzz.timestamp.go
similarity index 100%
rename from zzz.timestamp.go
rename to pgtype/zzz.timestamp.go
diff --git a/zzz.timestamptz.go b/pgtype/zzz.timestamptz.go
similarity index 100%
rename from zzz.timestamptz.go
rename to pgtype/zzz.timestamptz.go
diff --git a/zzz.uuid.go b/pgtype/zzz.uuid.go
similarity index 100%
rename from zzz.uuid.go
rename to pgtype/zzz.uuid.go
diff --git a/zzz.varbit.go b/pgtype/zzz.varbit.go
similarity index 100%
rename from zzz.varbit.go
rename to pgtype/zzz.varbit.go
diff --git a/zzz.varchar.go b/pgtype/zzz.varchar.go
similarity index 100%
rename from zzz.varchar.go
rename to pgtype/zzz.varchar.go
diff --git a/zzz.xid.go b/pgtype/zzz.xid.go
similarity index 100%
rename from zzz.xid.go
rename to pgtype/zzz.xid.go