diff --git a/SQL/Auftraggeber.sql b/SQL/Auftraggeber.sql
new file mode 100644
index 0000000..85a2dd9
--- /dev/null
+++ b/SQL/Auftraggeber.sql
@@ -0,0 +1,20 @@
+-- Table: public.auftraggeber
+
+-- DROP TABLE IF EXISTS public.auftraggeber;
+
+CREATE TABLE IF NOT EXISTS public.auftraggeber
+(
+    auftraggeber_id integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    name text COLLATE pg_catalog."default",
+    strasse text COLLATE pg_catalog."default",
+    ort text COLLATE pg_catalog."default",
+    postleitzahl text COLLATE pg_catalog."default",
+    ansprechpartner text COLLATE pg_catalog."default",
+    telefonnummer text COLLATE pg_catalog."default",
+    CONSTRAINT "PK_Auftraggebers" PRIMARY KEY (auftraggeber_id)
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.auftraggeber
+    OWNER to "SewerGen";
\ No newline at end of file
diff --git a/SQL/Auftraggebers.sql b/SQL/Auftraggebers.sql
deleted file mode 100644
index 9f0aa7d..0000000
--- a/SQL/Auftraggebers.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Table: public.Auftraggebers
-
--- DROP TABLE IF EXISTS public."Auftraggebers";
-
-CREATE TABLE IF NOT EXISTS public."Auftraggebers"
-(
-    "Id" integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    "Name" text COLLATE pg_catalog."default",
-    "Strasse" text COLLATE pg_catalog."default",
-    "Ort" text COLLATE pg_catalog."default",
-    "Postleitzahl" text COLLATE pg_catalog."default",
-    "Ansprechpartner" text COLLATE pg_catalog."default",
-    "Telefonnummer" text COLLATE pg_catalog."default",
-    CONSTRAINT "PK_Auftraggebers" PRIMARY KEY ("Id")
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE IF EXISTS public."Auftraggebers"
-    OWNER to "SewerGen";
\ No newline at end of file
diff --git a/SQL/Kanaele.sql b/SQL/Kanaele.sql
deleted file mode 100644
index 5266ebc..0000000
--- a/SQL/Kanaele.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Table: public.Kanaele
-
--- DROP TABLE IF EXISTS public."Kanaele";
-
-CREATE TABLE IF NOT EXISTS public."Kanaele"
-(
-    "Id" integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    "Objektbezeichnung" text COLLATE pg_catalog."default",
-    "StartSchachtId" integer,
-    "EndSchachtId" integer,
-    "DN" integer NOT NULL,
-    "Material" text COLLATE pg_catalog."default",
-    "Haltungslaenge" numeric NOT NULL,
-    "Entwaesserung" integer NOT NULL,
-    "ProjektId" integer,
-    CONSTRAINT "PK_Kanaele" PRIMARY KEY ("Id"),
-    CONSTRAINT "FK_Kanaele_Projekte_ProjektId" FOREIGN KEY ("ProjektId")
-        REFERENCES public."Projekte" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION,
-    CONSTRAINT "FK_Kanaele_Schaechte_EndSchachtId" FOREIGN KEY ("EndSchachtId")
-        REFERENCES public."Schaechte" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION,
-    CONSTRAINT "FK_Kanaele_Schaechte_StartSchachtId" FOREIGN KEY ("StartSchachtId")
-        REFERENCES public."Schaechte" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE IF EXISTS public."Kanaele"
-    OWNER to "SewerGen";
--- Index: IX_Kanaele_EndSchachtId
-
--- DROP INDEX IF EXISTS public."IX_Kanaele_EndSchachtId";
-
-CREATE INDEX IF NOT EXISTS "IX_Kanaele_EndSchachtId"
-    ON public."Kanaele" USING btree
-    ("EndSchachtId" ASC NULLS LAST)
-    TABLESPACE pg_default;
--- Index: IX_Kanaele_ProjektId
-
--- DROP INDEX IF EXISTS public."IX_Kanaele_ProjektId";
-
-CREATE INDEX IF NOT EXISTS "IX_Kanaele_ProjektId"
-    ON public."Kanaele" USING btree
-    ("ProjektId" ASC NULLS LAST)
-    TABLESPACE pg_default;
--- Index: IX_Kanaele_StartSchachtId
-
--- DROP INDEX IF EXISTS public."IX_Kanaele_StartSchachtId";
-
-CREATE INDEX IF NOT EXISTS "IX_Kanaele_StartSchachtId"
-    ON public."Kanaele" USING btree
-    ("StartSchachtId" ASC NULLS LAST)
-    TABLESPACE pg_default;
\ No newline at end of file
diff --git a/SQL/Projekt.sql b/SQL/Projekt.sql
new file mode 100644
index 0000000..dc6ed01
--- /dev/null
+++ b/SQL/Projekt.sql
@@ -0,0 +1,33 @@
+-- Table: public.projekt
+
+-- DROP TABLE IF EXISTS public.projekt;
+
+CREATE TABLE IF NOT EXISTS public.projekt
+(
+    projekt_id integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    projektname text COLLATE pg_catalog."default",
+    erstelldatum text COLLATE pg_catalog."default",
+    strasse text COLLATE pg_catalog."default",
+    ort text COLLATE pg_catalog."default",
+    exporttype integer NOT NULL,
+    kodierungssystem integer NOT NULL,
+    ref_auftraggeber_id integer NOT NULL DEFAULT 0,
+    CONSTRAINT "PK_Projekte" PRIMARY KEY (projekt_id),
+    CONSTRAINT "FK_Projekte_Auftraggebers_AuftraggeberId" FOREIGN KEY (ref_auftraggeber_id)
+        REFERENCES public."Auftraggebers" ("Id") MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE CASCADE
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.projekt
+    OWNER to "SewerGen";
+-- Index: IX_Projekte_AuftraggeberId
+
+-- DROP INDEX IF EXISTS public."IX_Projekte_AuftraggeberId";
+
+CREATE INDEX IF NOT EXISTS "IX_Projekte_AuftraggeberId"
+    ON public.projekt USING btree
+    (ref_auftraggeber_id ASC NULLS LAST)
+    TABLESPACE pg_default;
\ No newline at end of file
diff --git a/SQL/Projekte.sql b/SQL/Projekte.sql
deleted file mode 100644
index 5dd0b83..0000000
--- a/SQL/Projekte.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- Table: public.Projekte
-
--- DROP TABLE IF EXISTS public."Projekte";
-
-CREATE TABLE IF NOT EXISTS public."Projekte"
-(
-    "Id" integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    "Projektname" text COLLATE pg_catalog."default",
-    "Erstelldatum" text COLLATE pg_catalog."default",
-    "Strasse" text COLLATE pg_catalog."default",
-    "Ort" text COLLATE pg_catalog."default",
-    "ExportType" integer NOT NULL,
-    "Kodierungssystem" integer NOT NULL,
-    "AuftraggeberId" integer NOT NULL DEFAULT 0,
-    CONSTRAINT "PK_Projekte" PRIMARY KEY ("Id"),
-    CONSTRAINT "FK_Projekte_Auftraggebers_AuftraggeberId" FOREIGN KEY ("AuftraggeberId")
-        REFERENCES public."Auftraggebers" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE CASCADE
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE IF EXISTS public."Projekte"
-    OWNER to "SewerGen";
--- Index: IX_Projekte_AuftraggeberId
-
--- DROP INDEX IF EXISTS public."IX_Projekte_AuftraggeberId";
-
-CREATE INDEX IF NOT EXISTS "IX_Projekte_AuftraggeberId"
-    ON public."Projekte" USING btree
-    ("AuftraggeberId" ASC NULLS LAST)
-    TABLESPACE pg_default;
\ No newline at end of file
diff --git a/SQL/Schacht.sql b/SQL/Schacht.sql
new file mode 100644
index 0000000..f2828f3
--- /dev/null
+++ b/SQL/Schacht.sql
@@ -0,0 +1,33 @@
+-- Table: public.schacht
+
+-- DROP TABLE IF EXISTS public.schacht;
+
+CREATE TABLE IF NOT EXISTS public.schacht
+(
+    schacht_id integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    objektbezeichnung text COLLATE pg_catalog."default",
+    rechtswert numeric(18,4) NOT NULL,
+    hochwert numeric(18,4) NOT NULL,
+    sohlhoehe numeric(18,4) NOT NULL,
+    deckelhoehe numeric(18,4) NOT NULL,
+    entwaesserung integer NOT NULL,
+    ref_projekt_id integer,
+    CONSTRAINT "PK_Schaechte" PRIMARY KEY (schacht_id),
+    CONSTRAINT "FK_Schaechte_Projekte_ProjektId" FOREIGN KEY (ref_projekt_id)
+        REFERENCES public.projekt (projekt_id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.schacht
+    OWNER to "SewerGen";
+-- Index: IX_Schaechte_ProjektId
+
+-- DROP INDEX IF EXISTS public."IX_Schaechte_ProjektId";
+
+CREATE INDEX IF NOT EXISTS "IX_Schaechte_ProjektId"
+    ON public.schacht USING btree
+    (ref_projekt_id ASC NULLS LAST)
+    TABLESPACE pg_default;
\ No newline at end of file
diff --git a/SQL/Schaechte.sql b/SQL/Schaechte.sql
deleted file mode 100644
index 100c5c2..0000000
--- a/SQL/Schaechte.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- Table: public.Schaechte
-
--- DROP TABLE IF EXISTS public."Schaechte";
-
-CREATE TABLE IF NOT EXISTS public."Schaechte"
-(
-    "Id" integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    "Objektbezeichnung" text COLLATE pg_catalog."default",
-    "RechtsWert" numeric(18,4) NOT NULL,
-    "HochWert" numeric(18,4) NOT NULL,
-    "SohlHoehe" numeric(18,4) NOT NULL,
-    "DeckelHoehe" numeric(18,4) NOT NULL,
-    "Entwaesserung" integer NOT NULL,
-    "ProjektId" integer,
-    CONSTRAINT "PK_Schaechte" PRIMARY KEY ("Id"),
-    CONSTRAINT "FK_Schaechte_Projekte_ProjektId" FOREIGN KEY ("ProjektId")
-        REFERENCES public."Projekte" ("Id") MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION
-)
-
-TABLESPACE pg_default;
-
-ALTER TABLE IF EXISTS public."Schaechte"
-    OWNER to "SewerGen";
--- Index: IX_Schaechte_ProjektId
-
--- DROP INDEX IF EXISTS public."IX_Schaechte_ProjektId";
-
-CREATE INDEX IF NOT EXISTS "IX_Schaechte_ProjektId"
-    ON public."Schaechte" USING btree
-    ("ProjektId" ASC NULLS LAST)
-    TABLESPACE pg_default;
\ No newline at end of file
diff --git a/SQL/haltung.sql b/SQL/haltung.sql
new file mode 100644
index 0000000..d050578
--- /dev/null
+++ b/SQL/haltung.sql
@@ -0,0 +1,58 @@
+-- Table: public.haltung
+
+-- DROP TABLE IF EXISTS public.haltung;
+
+CREATE TABLE IF NOT EXISTS public.haltung
+(
+    haltung_id integer NOT NULL GENERATED BY DEFAULT AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
+    objektbezeichnung text COLLATE pg_catalog."default",
+    ref_startschacht_id integer,
+    ref_endschacht_id integer,
+    dn integer NOT NULL,
+    material text COLLATE pg_catalog."default",
+    haltungslaenge numeric NOT NULL,
+    entwaesserung integer NOT NULL,
+    ref_projekt_id integer,
+    CONSTRAINT "PK_Kanaele" PRIMARY KEY (haltung_id),
+    CONSTRAINT "FK_Kanaele_Projekte_ProjektId" FOREIGN KEY (ref_projekt_id)
+        REFERENCES public.projekte (projekt_id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION,
+    CONSTRAINT "FK_Kanaele_Schaechte_EndSchachtId" FOREIGN KEY (ref_endschacht_id)
+        REFERENCES public.schaechte (schacht_id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION,
+    CONSTRAINT "FK_Kanaele_Schaechte_StartSchachtId" FOREIGN KEY (ref_startschacht_id)
+        REFERENCES public.schaechte (schacht_id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE NO ACTION
+)
+
+TABLESPACE pg_default;
+
+ALTER TABLE IF EXISTS public.haltung
+    OWNER to "SewerGen";
+-- Index: IX_Kanaele_EndSchachtId
+
+-- DROP INDEX IF EXISTS public."IX_Kanaele_EndSchachtId";
+
+CREATE INDEX IF NOT EXISTS "IX_Kanaele_EndSchachtId"
+    ON public.haltung USING btree
+    (ref_endschacht_id ASC NULLS LAST)
+    TABLESPACE pg_default;
+-- Index: IX_Kanaele_ProjektId
+
+-- DROP INDEX IF EXISTS public."IX_Kanaele_ProjektId";
+
+CREATE INDEX IF NOT EXISTS "IX_Kanaele_ProjektId"
+    ON public.haltung USING btree
+    (ref_projekt_id ASC NULLS LAST)
+    TABLESPACE pg_default;
+-- Index: IX_Kanaele_StartSchachtId
+
+-- DROP INDEX IF EXISTS public."IX_Kanaele_StartSchachtId";
+
+CREATE INDEX IF NOT EXISTS "IX_Kanaele_StartSchachtId"
+    ON public.haltung USING btree
+    (ref_startschacht_id ASC NULLS LAST)
+    TABLESPACE pg_default;
\ No newline at end of file