diff --git a/org/eu/fr/region/FranceDepartementCode.ts b/org/eu/fr/region/FranceDepartementCode.ts
index 963595a36a..04e3e5c91c 100644
--- a/org/eu/fr/region/FranceDepartementCode.ts
+++ b/org/eu/fr/region/FranceDepartementCode.ts
@@ -17,6 +17,7 @@ export enum FranceDepartementCode {
   Gard = "30",
   HauteGaronne = "31",
   Gers = "32",
+  Gironde = "33",
   Herault = "34",
   Indre = "36",
   Isere = "38",
diff --git a/org/eu/fr/region/naq/23/Creuse.ts b/org/eu/fr/region/naq/23/Creuse.ts
index 5b48024ac3..9a6784bf79 100644
--- a/org/eu/fr/region/naq/23/Creuse.ts
+++ b/org/eu/fr/region/naq/23/Creuse.ts
@@ -1,7 +1,7 @@
 import { NouvelleAquitaineDepartmentCode } from "../NouvelleAquitaineDepartmentCode"
 import { Place } from "../../../../../../place/Place"
-import { Organization, OrganizationType } from "../../../../../Organization"
 import { nouvelleAquitaine } from "../NouvelleAquitaine"
+import { Department } from "../../../../../country/region/department/Department"
 
-export const creuse = new Organization(NouvelleAquitaineDepartmentCode.Creuse,
-  [Place.fromLocation(46.189722, 2.085556)], OrganizationType.department, nouvelleAquitaine)
+export const creuse = Department.create(NouvelleAquitaineDepartmentCode.Creuse,
+  nouvelleAquitaine, Place.fromLocation(46.189722, 2.085556))
diff --git a/org/eu/fr/region/naq/23/CreuseCities.ts b/org/eu/fr/region/naq/23/CreuseCities.ts
index 71528ce7ae..42662672ba 100644
--- a/org/eu/fr/region/naq/23/CreuseCities.ts
+++ b/org/eu/fr/region/naq/23/CreuseCities.ts
@@ -1,6 +1,6 @@
 import { chambonSurVoueize23 } from "./chambon/Chambon"
-import { Organization } from "../../../../../Organization"
+import { City } from "../../../../../country/region/department/city/City"
 
-export const creuseCities: Organization[] = [
+export const creuseCities: City[] = [
   chambonSurVoueize23
 ]
diff --git a/org/eu/fr/region/naq/23/CreuseCityMessages.ts b/org/eu/fr/region/naq/23/CreuseMessages.ts
similarity index 72%
rename from org/eu/fr/region/naq/23/CreuseCityMessages.ts
rename to org/eu/fr/region/naq/23/CreuseMessages.ts
index b9961f7761..1911e384bf 100644
--- a/org/eu/fr/region/naq/23/CreuseCityMessages.ts
+++ b/org/eu/fr/region/naq/23/CreuseMessages.ts
@@ -1,9 +1,9 @@
 import { chambonMessages } from "./chambon/ChambonMessages"
 import { CreuseCityCode } from "./CreuseCityCode"
-import { OrganizationMessages } from "../../../../../OrganizationMessages"
 import { DepartmentMessages } from "../../../../../country/region/department/DepartmentMessages"
+import { CityMessages } from "../../../../../country/region/department/city/CityMessages"
 
-type CreuseCityMessagesList = { [key in CreuseCityCode]: OrganizationMessages }
+type CreuseCityMessagesList = { [key in CreuseCityCode]: CityMessages }
 const creuseCityMessages: CreuseCityMessagesList = {
   [CreuseCityCode.ChambonSurVoueize]: chambonMessages
 }
diff --git a/org/eu/fr/region/naq/23/chambon/ChambonMessages.ts b/org/eu/fr/region/naq/23/chambon/ChambonMessages.ts
index be30f70e4e..947fa40bc6 100644
--- a/org/eu/fr/region/naq/23/chambon/ChambonMessages.ts
+++ b/org/eu/fr/region/naq/23/chambon/ChambonMessages.ts
@@ -1,3 +1,3 @@
-import { DepartmentMessages } from "../../../../../../country/region/department/DepartmentMessages"
+import { CityMessages } from "../../../../../../country/region/department/city/CityMessages"
 
-export let chambonMessages = new DepartmentMessages("Chambon-sur-Voueize")
+export const chambonMessages = new CityMessages("Chambon-sur-Voueize")
diff --git a/org/eu/fr/region/naq/33/Gironde.ts b/org/eu/fr/region/naq/33/Gironde.ts
new file mode 100644
index 0000000000..82a23b0e5f
--- /dev/null
+++ b/org/eu/fr/region/naq/33/Gironde.ts
@@ -0,0 +1,7 @@
+import { NouvelleAquitaineDepartmentCode } from "../NouvelleAquitaineDepartmentCode"
+import { Place } from "../../../../../../place/Place"
+import { nouvelleAquitaine } from "../NouvelleAquitaine"
+import { Department } from "../../../../../country/region/department/Department"
+
+export const gironde = Department.create(NouvelleAquitaineDepartmentCode.Gironde,
+  nouvelleAquitaine, Place.fromDMS("44°50′14″N,0°35′12″O"))
diff --git a/org/eu/fr/region/naq/33/GirondeCities.ts b/org/eu/fr/region/naq/33/GirondeCities.ts
new file mode 100644
index 0000000000..8401de2a0d
--- /dev/null
+++ b/org/eu/fr/region/naq/33/GirondeCities.ts
@@ -0,0 +1,6 @@
+import { saintAndreDeCubzac } from "./saintandredecubzac/SaintAndreDeCubzac"
+import { City } from "../../../../../country/region/department/city/City"
+
+export const girondeCities: City[] = [
+  saintAndreDeCubzac
+]
diff --git a/org/eu/fr/region/naq/33/GirondeCityCode.ts b/org/eu/fr/region/naq/33/GirondeCityCode.ts
new file mode 100644
index 0000000000..9179f8b5aa
--- /dev/null
+++ b/org/eu/fr/region/naq/33/GirondeCityCode.ts
@@ -0,0 +1,3 @@
+export enum GirondeCityCode {
+  SaintAndreDeCubzac = 33366
+}
diff --git a/org/eu/fr/region/naq/33/GirondeMessages.ts b/org/eu/fr/region/naq/33/GirondeMessages.ts
new file mode 100644
index 0000000000..109e1aed13
--- /dev/null
+++ b/org/eu/fr/region/naq/33/GirondeMessages.ts
@@ -0,0 +1,10 @@
+import { saintAndreDeCubzacMessages } from "./saintandredecubzac/SaintAndreDeCubzacMessages"
+import { GirondeCityCode } from "./GirondeCityCode"
+import { DepartmentMessages } from "../../../../../country/region/department/DepartmentMessages"
+import { CityMessages } from "../../../../../country/region/department/city/CityMessages"
+
+type GirondeCityMessagesList = { [key in GirondeCityCode]: CityMessages }
+const girondeCityMessages: GirondeCityMessagesList = {
+  [GirondeCityCode.SaintAndreDeCubzac]: saintAndreDeCubzacMessages
+}
+export const girondeMessages = DepartmentMessages.create<GirondeCityMessagesList>("Gironde", girondeCityMessages)
diff --git a/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzac.ts b/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzac.ts
new file mode 100644
index 0000000000..4f42689983
--- /dev/null
+++ b/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzac.ts
@@ -0,0 +1,5 @@
+import { franceCity } from "../../../../FranceCity"
+import { Place } from "../../../../../../../place/Place"
+import { GirondeCityCode } from "../GirondeCityCode"
+
+export const saintAndreDeCubzac = franceCity(GirondeCityCode.SaintAndreDeCubzac, Place.fromDMS("44°59′44″N,0°26′41″O"))
diff --git a/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzacMessages.ts b/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzacMessages.ts
new file mode 100644
index 0000000000..c921403a78
--- /dev/null
+++ b/org/eu/fr/region/naq/33/saintandredecubzac/SaintAndreDeCubzacMessages.ts
@@ -0,0 +1,3 @@
+import { CityMessages } from "../../../../../../country/region/department/city/CityMessages"
+
+export const saintAndreDeCubzacMessages = new CityMessages("Saint-André-de-Cubzac")
diff --git a/org/eu/fr/region/naq/NouvelleAquitaineCities.ts b/org/eu/fr/region/naq/NouvelleAquitaineCities.ts
index c4abff83d6..497c58f730 100644
--- a/org/eu/fr/region/naq/NouvelleAquitaineCities.ts
+++ b/org/eu/fr/region/naq/NouvelleAquitaineCities.ts
@@ -4,11 +4,13 @@ import { landesCities } from "./40/LandesCities"
 import { charenteMaritimeCities } from "./17/CharenteMaritimeCities"
 import { Organization } from "../../../../Organization"
 import { correzeCities } from "./19/CorrezeCities"
+import { girondeCities } from "./33/GirondeCities"
 
 export const nouvelleAquitaineCities: Organization[] = [
   ...charenteCities,
   ...charenteMaritimeCities,
   ...correzeCities,
   ...creuseCities,
+  ...girondeCities,
   ...landesCities
 ]
diff --git a/org/eu/fr/region/naq/NouvelleAquitaineDepartmentCode.ts b/org/eu/fr/region/naq/NouvelleAquitaineDepartmentCode.ts
index 8f766e1949..5f27c66231 100644
--- a/org/eu/fr/region/naq/NouvelleAquitaineDepartmentCode.ts
+++ b/org/eu/fr/region/naq/NouvelleAquitaineDepartmentCode.ts
@@ -5,6 +5,7 @@ export enum NouvelleAquitaineDepartmentCode {
   CharenteMaritime = FranceDepartementCode.CharenteMaritime,
   Correze = FranceDepartementCode.Correze,
   Creuse = FranceDepartementCode.Creuse,
+  Gironde = FranceDepartementCode.Gironde,
   Landes = FranceDepartementCode.Landes,
   Vienne = FranceDepartementCode.Vienne,
 }
diff --git a/org/eu/fr/region/naq/NouvelleAquitaineDepartments.ts b/org/eu/fr/region/naq/NouvelleAquitaineDepartments.ts
index ecd0b12f6a..172d2cf257 100644
--- a/org/eu/fr/region/naq/NouvelleAquitaineDepartments.ts
+++ b/org/eu/fr/region/naq/NouvelleAquitaineDepartments.ts
@@ -5,12 +5,14 @@ import { charenteMaritime } from "./17/CharenteMaritime"
 import { vienne } from "./86/Vienne"
 import { Organization } from "../../../../Organization"
 import { correze } from "./19/Correze"
+import { gironde } from "./33/Gironde"
 
 export const nouvelleAquitaineDepartments: Organization[] = [
   charente,
   charenteMaritime,
   correze,
   creuse,
+  gironde,
   landes,
   vienne
 ]
diff --git a/org/eu/fr/region/naq/NouvelleAquitaineMessages.ts b/org/eu/fr/region/naq/NouvelleAquitaineMessages.ts
index 4a546b69dd..b0f1c5e22c 100644
--- a/org/eu/fr/region/naq/NouvelleAquitaineMessages.ts
+++ b/org/eu/fr/region/naq/NouvelleAquitaineMessages.ts
@@ -1,18 +1,20 @@
 import { RegionMessages } from "../../../../country/region/RegionMessages"
 import { NouvelleAquitaineDepartmentCode } from "./NouvelleAquitaineDepartmentCode"
-import { creuseMessages } from "./23/CreuseCityMessages"
+import { creuseMessages } from "./23/CreuseMessages"
 import { charenteMessages } from "./16/CharenteMessages"
 import { landesMessages } from "./40/LandesMessages"
 import { charenteMaritimeMessages } from "./17/CharenteMaritimeMessages"
 import { vienneMessages } from "./86/VienneMessages"
 import { DepartmentMessages } from "../../../../country/region/department/DepartmentMessages"
 import { correzeMessages } from "./19/CorrezeMessages"
+import { girondeMessages } from "./33/GirondeMessages"
 
 export const nouvelleAquitaineMessageList: { [key in NouvelleAquitaineDepartmentCode]: DepartmentMessages<any> } = {
   [NouvelleAquitaineDepartmentCode.Charente]: charenteMessages,
   [NouvelleAquitaineDepartmentCode.CharenteMaritime]: charenteMaritimeMessages,
   [NouvelleAquitaineDepartmentCode.Correze]: correzeMessages,
   [NouvelleAquitaineDepartmentCode.Creuse]: creuseMessages,
+  [NouvelleAquitaineDepartmentCode.Gironde]: girondeMessages,
   [NouvelleAquitaineDepartmentCode.Landes]: landesMessages,
   [NouvelleAquitaineDepartmentCode.Vienne]: vienneMessages
 }