diff --git a/capzlog-ExtractDataFromPDF/Flight.cs b/capzlog-ExtractDataFromPDF/Flight.cs
deleted file mode 100644
index 81b846d..0000000
--- a/capzlog-ExtractDataFromPDF/Flight.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace DefaultNamespace
-{
-    public class Flight
-    {
-        private string ident = "";
-        private FlightInfo flightInfo;
-    }
-
-    public class FlightInfo
-    {
-        public string Date { get; set; } = "";
-        public string Reg { get; set; } = "";
-        public string Type { get; set; } = "";
-        public string From { get; set; } = "";
-        public string To { get; set; } = "";
-        public string Altn1 { get; set; } = "";
-        public string FltNr { get; set; } = "";
-        public string ATC { get; set; } = "";
-    }
-
-    public class Times
-    {
-        public string STD { get; set; } = "";
-        public string STA { get; set; } = "";
-    }
-
-    public class Loadmass
-    {
-        public string ZFM { get; set; } = "";
-    }
-
-    public class Fuel
-    {
-        public string LIMC { get; set; } = "";
-        public string LIML { get; set; } = "";
-        public string MIN { get; set; } = "";
-
-    }
-
-    public class Corrections
-    {
-        public double gain-loss { get; set; } = 0;
-    }
-
-
-}
diff --git a/capzlog-ExtractDataFromPDF/models/Flight.cs b/capzlog-ExtractDataFromPDF/models/Flight.cs
new file mode 100644
index 0000000..fd632bd
--- /dev/null
+++ b/capzlog-ExtractDataFromPDF/models/Flight.cs
@@ -0,0 +1,47 @@
+namespace capzlog_ExtractDataFromPDF.models
+{
+    public class Flight
+    {
+        public string Identifier { get; private set; } = "";
+        public FlightInfo Info { get; set; } = new FlightInfo();
+        public Times Schedule { get; set; } = new Times();
+        public LoadMass MassLoad { get; set; } = new LoadMass();
+        public Fuel FuelData { get; set; } = new Fuel();
+        public Corrections Correction { get; set; } = new Corrections();
+    }
+
+    public class FlightInfo
+    {
+        public string Date { get; set; } = "";
+        public string Registration { get; set; } = "";
+        public string AircraftType { get; set; } = "";
+        public string Departure { get; set; } = "";
+        public string Destination { get; set; } = "";
+        public string Alternate1 { get; set; } = "";
+        public string FlightNumber { get; set; } = "";
+        public string ATCCode { get; set; } = "";
+    }
+
+    public class Times
+    {
+        public string ScheduledDepartureTime { get; set; } = "";
+        public string ScheduledArrivalTime { get; set; } = "";
+    }
+
+    public class LoadMass
+    {
+        public string ZeroFuelMass { get; set; } = "";
+    }
+
+    public class Fuel
+    {
+        public string Limc { get; set; } = "";
+        public string Liml { get; set; } = "";
+        public string MinimumRequired { get; set; } = "";
+    }
+
+    public class Corrections
+    {
+        public double GainOrLoss { get; set; } = 0.0;
+    }
+}
\ No newline at end of file
diff --git a/capzlog-ExtractDataFromPDF/models/crew.cs b/capzlog-ExtractDataFromPDF/models/crew.cs
new file mode 100644
index 0000000..8ef94ea
--- /dev/null
+++ b/capzlog-ExtractDataFromPDF/models/crew.cs
@@ -0,0 +1,10 @@
+namespace capzlog_ExtractDataFromPDF.models;
+
+public class Crew
+{
+    public string Function { get; set; } = "";
+    public string Lc { get; set; } = "";
+    public string Name { get; set; } = "";
+    public string FunctionExtended { get; set; } = "";
+    
+}
\ No newline at end of file