diff --git a/Jugenddienst Stunden/Models/Gemeinde.cs b/Jugenddienst Stunden/Models/Gemeinde.cs
deleted file mode 100644
index a94be8f..0000000
--- a/Jugenddienst Stunden/Models/Gemeinde.cs	
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Gemeinde {
-		public int Id { get; set; }
-		public string Name { get; set; }
-
-		public Gemeinde(int id, string name) {
-			Id = id;
-			Name = name;
-		}
-	}
-}
diff --git a/Jugenddienst Stunden/Models/Hours.cs b/Jugenddienst Stunden/Models/Hours.cs
index d3dcbd4..b13e432 100644
--- a/Jugenddienst Stunden/Models/Hours.cs	
+++ b/Jugenddienst Stunden/Models/Hours.cs	
@@ -1,9 +1,11 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using Jugenddienst_Stunden.Types;
 using Newtonsoft.Json;
 
-namespace Jugenddienst_Stunden.Models {
-	public class Hours : ObservableObject {
+namespace Jugenddienst_Stunden.Models
+{
+    public class Hours : ObservableObject {
 		public string zeit;
 		public string nominal;
 		//public Dictionary<DateOnly,NominalDay> nominal_day_api;
diff --git a/Jugenddienst Stunden/Models/NominalWeek.cs b/Jugenddienst Stunden/Models/NominalWeek.cs
deleted file mode 100644
index 4fdee5b..0000000
--- a/Jugenddienst Stunden/Models/NominalWeek.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	public class NominalWeek {
-		public int week_number;
-		public decimal hours;
-	}
-}
diff --git a/Jugenddienst Stunden/Models/Projekt.cs b/Jugenddienst Stunden/Models/Projekt.cs
deleted file mode 100644
index 3840b5f..0000000
--- a/Jugenddienst Stunden/Models/Projekt.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Projekt {
-		public int Id { get; set; }
-		public string Name { get; set; }
-	}
-}
diff --git a/Jugenddienst Stunden/Models/TimeDay.cs b/Jugenddienst Stunden/Models/TimeDay.cs
deleted file mode 100644
index d2da6b0..0000000
--- a/Jugenddienst Stunden/Models/TimeDay.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	public class TimeDay {
-		public int Day { get; set; }
-		public decimal Hours { get; set; }
-	}
-}
diff --git a/Jugenddienst Stunden/Models/Timetable.cs b/Jugenddienst Stunden/Models/Timetable.cs
deleted file mode 100644
index 74fa77a..0000000
--- a/Jugenddienst Stunden/Models/Timetable.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class Timetable {
-		public List<TimetableEntry> timetable;
-		public decimal wochensumme;
-	}
-}
diff --git a/Jugenddienst Stunden/Models/TimetableEntry.cs b/Jugenddienst Stunden/Models/TimetableEntry.cs
deleted file mode 100644
index bd45229..0000000
--- a/Jugenddienst Stunden/Models/TimetableEntry.cs	
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Jugenddienst_Stunden.Models {
-	internal class TimetableEntry {
-		public List<TimeOnly>? von;
-		public List<TimeOnly>? bis;
-		public decimal summe { get; set; }
-	}
-}
diff --git a/Jugenddienst Stunden/Types/Gemeinde.cs b/Jugenddienst Stunden/Types/Gemeinde.cs
new file mode 100644
index 0000000..1bb55b1
--- /dev/null
+++ b/Jugenddienst Stunden/Types/Gemeinde.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Gemeinde
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+
+        public Gemeinde(int id, string name)
+        {
+            Id = id;
+            Name = name;
+        }
+    }
+}
diff --git a/Jugenddienst Stunden/Models/NominalDay.cs b/Jugenddienst Stunden/Types/NominalDay.cs
similarity index 100%
rename from Jugenddienst Stunden/Models/NominalDay.cs
rename to Jugenddienst Stunden/Types/NominalDay.cs
diff --git a/Jugenddienst Stunden/Types/NominalWeek.cs b/Jugenddienst Stunden/Types/NominalWeek.cs
new file mode 100644
index 0000000..9d2917d
--- /dev/null
+++ b/Jugenddienst Stunden/Types/NominalWeek.cs	
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    public class NominalWeek
+    {
+        public int week_number;
+        public decimal hours;
+    }
+}
diff --git a/Jugenddienst Stunden/Types/Projekt.cs b/Jugenddienst Stunden/Types/Projekt.cs
new file mode 100644
index 0000000..1135635
--- /dev/null
+++ b/Jugenddienst Stunden/Types/Projekt.cs	
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Projekt
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
diff --git a/Jugenddienst Stunden/Types/TimeDay.cs b/Jugenddienst Stunden/Types/TimeDay.cs
new file mode 100644
index 0000000..62aee73
--- /dev/null
+++ b/Jugenddienst Stunden/Types/TimeDay.cs	
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    public class TimeDay
+    {
+        public int Day { get; set; }
+        public decimal Hours { get; set; }
+    }
+}
diff --git a/Jugenddienst Stunden/Types/Timetable.cs b/Jugenddienst Stunden/Types/Timetable.cs
new file mode 100644
index 0000000..a1012d4
--- /dev/null
+++ b/Jugenddienst Stunden/Types/Timetable.cs	
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class Timetable
+    {
+        public List<TimetableEntry> timetable;
+        public decimal wochensumme;
+    }
+}
diff --git a/Jugenddienst Stunden/Types/TimetableEntry.cs b/Jugenddienst Stunden/Types/TimetableEntry.cs
new file mode 100644
index 0000000..d93dcd1
--- /dev/null
+++ b/Jugenddienst Stunden/Types/TimetableEntry.cs	
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Types
+{
+    internal class TimetableEntry
+    {
+        public List<TimeOnly>? von;
+        public List<TimeOnly>? bis;
+        public decimal summe { get; set; }
+    }
+}
diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index 789fc8a..d4f13cc 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
@@ -6,11 +6,12 @@ using Microsoft.Maui.Networking;
 using ZXing.Net.Maui;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Jugenddienst_Stunden.Models;
+using Jugenddienst_Stunden.Types;
 
 
-namespace Jugenddienst_Stunden.ViewModels {
-	internal class StundenViewModel : ObservableObject {
+namespace Jugenddienst_Stunden.ViewModels
+{
+    internal class StundenViewModel : ObservableObject {
 		public string Name => AppInfo.Name;
 		public string Surname => AppInfo.VersionString;
 		public string MoreInfoUrl => "https://aka.ms/maui";
@@ -42,7 +43,7 @@ namespace Jugenddienst_Stunden.ViewModels {
 		//	get => _hour.zeit_total_daily;
 		//}
 
-		public List<Models.TimeDay> ZeitTotalDaily {
+		public List<TimeDay> ZeitTotalDaily {
 			get => _hour.zeit_total_daily_api;
 		}