diff --git a/AboTracker.xcodeproj/project.pbxproj b/AboTracker.xcodeproj/project.pbxproj
index 08cf052..9a9c600 100644
--- a/AboTracker.xcodeproj/project.pbxproj
+++ b/AboTracker.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		D40CCAEF2C2DC5D8007C4A9F /* Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D40CCAEE2C2DC5D8007C4A9F /* Subscription.swift */; };
 		D40CCAF32C2EE305007C4A9F /* AddSubscriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D40CCAF22C2EE304007C4A9F /* AddSubscriptionView.swift */; };
 		D426C55A2C2F0F150057455D /* PaymentCalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D426C5592C2F0F150057455D /* PaymentCalendarView.swift */; };
+		D435872C2C3447ED00DD321B /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D435872A2C3447ED00DD321B /* Model.xcdatamodeld */; };
 		D4544FEF2C320AF30090E311 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4544FEE2C320AF30090E311 /* HomeView.swift */; };
 /* End PBXBuildFile section */
 
@@ -27,6 +28,7 @@
 		D40CCAEE2C2DC5D8007C4A9F /* Subscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Subscription.swift; sourceTree = "<group>"; };
 		D40CCAF22C2EE304007C4A9F /* AddSubscriptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddSubscriptionView.swift; sourceTree = "<group>"; };
 		D426C5592C2F0F150057455D /* PaymentCalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentCalendarView.swift; sourceTree = "<group>"; };
+		D435872B2C3447ED00DD321B /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		D4544FEE2C320AF30090E311 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -62,6 +64,7 @@
 			children = (
 				D40CCADF2C2DC5A9007C4A9F /* AboTrackerApp.swift */,
 				D40CCAEE2C2DC5D8007C4A9F /* Subscription.swift */,
+				D435872A2C3447ED00DD321B /* Model.xcdatamodeld */,
 				D4544FF02C320B920090E311 /* views */,
 				D40CCAE32C2DC5AA007C4A9F /* Assets.xcassets */,
 				D40CCAE52C2DC5AA007C4A9F /* AboTracker.entitlements */,
@@ -162,6 +165,7 @@
 				D40CCAEF2C2DC5D8007C4A9F /* Subscription.swift in Sources */,
 				D40CCAF32C2EE305007C4A9F /* AddSubscriptionView.swift in Sources */,
 				D40CCAE22C2DC5A9007C4A9F /* ContentView.swift in Sources */,
+				D435872C2C3447ED00DD321B /* Model.xcdatamodeld in Sources */,
 				D4544FEF2C320AF30090E311 /* HomeView.swift in Sources */,
 				D426C55A2C2F0F150057455D /* PaymentCalendarView.swift in Sources */,
 				D40CCAE02C2DC5A9007C4A9F /* AboTrackerApp.swift in Sources */,
@@ -383,6 +387,19 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCVersionGroup section */
+		D435872A2C3447ED00DD321B /* Model.xcdatamodeld */ = {
+			isa = XCVersionGroup;
+			children = (
+				D435872B2C3447ED00DD321B /* Model.xcdatamodel */,
+			);
+			currentVersion = D435872B2C3447ED00DD321B /* Model.xcdatamodel */;
+			path = Model.xcdatamodeld;
+			sourceTree = "<group>";
+			versionGroupType = wrapper.xcdatamodel;
+		};
+/* End XCVersionGroup section */
 	};
 	rootObject = D40CCAD42C2DC5A9007C4A9F /* Project object */;
 }
diff --git a/AboTracker/Model.xcdatamodeld/Model.xcdatamodel/contents b/AboTracker/Model.xcdatamodeld/Model.xcdatamodel/contents
new file mode 100644
index 0000000..3783ca0
--- /dev/null
+++ b/AboTracker/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+    <entity name="Subscription" representedClassName="Subscription" syncable="YES" codeGenerationType="class">
+        <attribute name="name" optional="YES" attributeType="String"/>
+    </entity>
+</model>
\ No newline at end of file
diff --git a/AboTracker/PersistenceController.swift b/AboTracker/PersistenceController.swift
deleted file mode 100644
index 206ef32..0000000
--- a/AboTracker/PersistenceController.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-import CoreData
-
-struct PersistenceController {
-    static let shared = PersistenceController()
-
-    let container: NSPersistentContainer
-
-    init() {
-        container = NSPersistentContainer(name: "SubscriptionModel")
-        container.loadPersistentStores { (storeDescription, error) in
-            if let error = error as NSError? {
-                fatalError("Unresolved error \(error), \(error.userInfo)")
-            }
-        }
-    }
-
-    var context: NSManagedObjectContext {
-        return container.viewContext
-    }
-}
diff --git a/AboTracker/SubscriptionModel.xcdatamodeld/SubscriptionModel.xcdatamodel/contents b/AboTracker/SubscriptionModel.xcdatamodeld/SubscriptionModel.xcdatamodel/contents
deleted file mode 100644
index b0a154d..0000000
--- a/AboTracker/SubscriptionModel.xcdatamodeld/SubscriptionModel.xcdatamodel/contents
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
-    <entity name="Payment" representedClassName="Payment" syncable="YES" codeGenerationType="class">
-        <attribute name="amount" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="interval" optional="YES" attributeType="String"/>
-        <attribute name="startDate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <relationship name="subscription" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Subscription"/>
-    </entity>
-    <entity name="Subscription" representedClassName="Subscription" syncable="YES" codeGenerationType="class">
-        <attribute name="color" optional="YES" attributeType="Transformable"/>
-        <attribute name="name" optional="YES" attributeType="String"/>
-        <relationship name="payments" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Payment"/>
-    </entity>
-</model>
\ No newline at end of file
diff --git a/AboTracker/data/Payment+CoreDataClass.swift b/AboTracker/data/Payment+CoreDataClass.swift
deleted file mode 100644
index 7b4beec..0000000
--- a/AboTracker/data/Payment+CoreDataClass.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-import Foundation
-import CoreData
-
-@objc(Payment)
-public class Payment: NSManagedObject {
-    @NSManaged public var amount: Double
-    @NSManaged public var interval: String
-    @NSManaged public var startDate: Date
-    @NSManaged public var subscription: Subscription
-}
diff --git a/AboTracker/data/Payment+CoreDataProperties.swift b/AboTracker/data/Payment+CoreDataProperties.swift
deleted file mode 100644
index fdcf70b..0000000
--- a/AboTracker/data/Payment+CoreDataProperties.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  Payment+CoreDataProperties.swift
-//  AboTracker
-//
-//  Created by Keyvan Atashfaraz on 02.07.24.
-//
-//
-
-import Foundation
-import CoreData
-
-
-extension Payment {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<Payment> {
-        return NSFetchRequest<Payment>(entityName: "Payment")
-    }
-
-    @NSManaged public var amount: Double
-    @NSManaged public var interval: String?
-    @NSManaged public var startDate: Date?
-    @NSManaged public var subscription: Subscription?
-
-}
-
-extension Payment : Identifiable {
-
-}
diff --git a/AboTracker/data/Subscription+CoreDataClass.swift b/AboTracker/data/Subscription+CoreDataClass.swift
deleted file mode 100644
index 303c941..0000000
--- a/AboTracker/data/Subscription+CoreDataClass.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-import Foundation
-import CoreData
-import SwiftUI
-
-@objc(Subscription)
-public class Subscription: NSManagedObject {
-    @NSManaged public var name: String
-    @NSManaged public var color: UIColor
-    @NSManaged public var payments: Set<Payment>
-}
diff --git a/AboTracker/data/Subscription+CoreDataProperties.swift b/AboTracker/data/Subscription+CoreDataProperties.swift
deleted file mode 100644
index a212918..0000000
--- a/AboTracker/data/Subscription+CoreDataProperties.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  Subscription+CoreDataProperties.swift
-//  AboTracker
-//
-//  Created by Keyvan Atashfaraz on 02.07.24.
-//
-//
-
-import Foundation
-import CoreData
-
-
-extension Subscription {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<Subscription> {
-        return NSFetchRequest<Subscription>(entityName: "Subscription")
-    }
-
-    @NSManaged public var name: String?
-    @NSManaged public var color: NSObject?
-    @NSManaged public var payments: Payment?
-
-}
-
-extension Subscription : Identifiable {
-
-}