diff --git a/lib/app.dart b/lib/app.dart
index 5ec7554..03346cb 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -1,4 +1,4 @@
-import './home.dart';
+import 'pages/appwritetest/home.dart';
 import 'package:flutter/material.dart';
 
 class AppwriteApp extends StatelessWidget {
diff --git a/lib/data/models/chart_model.dart b/lib/data/models/chart_model.dart
new file mode 100644
index 0000000..fbc9cd4
--- /dev/null
+++ b/lib/data/models/chart_model.dart
@@ -0,0 +1,36 @@
+class ChartData {
+  final double dateInMilliseconds;
+  final double liters;
+  final double pricePerLiter;
+  final double totalPrice;
+
+  ChartData({
+    required this.dateInMilliseconds,
+    required this.liters,
+    required this.pricePerLiter,
+    required this.totalPrice,
+  });
+}
+
+class PricePoints {
+  final double x;
+  final double y;
+
+  PricePoints({required this.x, required this.y});
+}
+
+class SumDataModel {
+  late String? szMonth;
+  late String? szSumme;
+  late String? szVerbrauch;
+  late int? mnTankungen;
+
+  SumDataModel(this.szMonth, this.szSumme, this.szVerbrauch, this.mnTankungen);
+}
+
+class YearModel {
+  final String szDescription;
+  final int mnYear;
+
+  YearModel(this.szDescription, this.mnYear);
+}
diff --git a/lib/data/models/login_model.dart b/lib/data/models/login_model.dart
new file mode 100644
index 0000000..1a7fb38
--- /dev/null
+++ b/lib/data/models/login_model.dart
@@ -0,0 +1,10 @@
+class AppWriteLoginModel {
+  String clientName;
+  String clientId;
+
+  AppWriteLoginModel({
+    this.clientName ='',
+    this.clientId='',
+  });
+  
+}
\ No newline at end of file
diff --git a/lib/data/models/map_model.dart b/lib/data/models/map_model.dart
new file mode 100644
index 0000000..d103e55
--- /dev/null
+++ b/lib/data/models/map_model.dart
@@ -0,0 +1,15 @@
+class AppWriteMapTrackPointsModel {
+  String szUserId;
+  String szAppWriteTrackUniqueId;
+  double mnLongitudeTrackPoint;
+  double mnLatitudeTrackPoint;
+  String szDateTimeTrackPoint;
+
+  AppWriteMapTrackPointsModel({
+    required this.szUserId,
+    required this.szAppWriteTrackUniqueId,
+    required this.mnLongitudeTrackPoint,
+    required this.mnLatitudeTrackPoint,
+    required this.szDateTimeTrackPoint,
+  });
+}
diff --git a/lib/data/models/tank_model.dart b/lib/data/models/tank_model.dart
new file mode 100644
index 0000000..73a3a52
--- /dev/null
+++ b/lib/data/models/tank_model.dart
@@ -0,0 +1,55 @@
+class AppWriteTankModel {
+  String documentId;
+  String userId;
+  String date;
+  String odometer;
+  String liters;
+  String pricePerLiter;
+  String location;
+  String? imageFileId;
+  String? imageFileName;
+  String? imageFileUrl;
+  int? mnIndexCount;
+
+  AppWriteTankModel({
+    required this.documentId,
+    required this.userId,
+    required this.date,
+    required this.odometer,
+    required this.liters,
+    required this.pricePerLiter,
+    required this.location,
+    this.imageFileId,
+    this.imageFileName,
+    this.imageFileUrl,
+  });
+
+  factory AppWriteTankModel.fromMap(Map<String, dynamic> map) {
+    return AppWriteTankModel(
+      documentId: map['\$id'] ?? '',
+      userId: map['userId'] ?? '',
+      date: map['date'] ?? '',
+      odometer: map['odometer']?.toString() ?? '',
+      liters: map['liters']?.toString() ?? '',
+      pricePerLiter: map['pricePerLiter']?.toString() ?? '',
+      location: map['location'] ?? '',
+      imageFileId: map['imageFileId'],
+      imageFileName: map['imageFileName'],
+      imageFileUrl: map['imageFileUrl'],
+    );
+  }
+  Map<String, dynamic> toMap() {
+    return {
+      '\$id': documentId,
+      'userId': userId,
+      'date': date,
+      'odometer': odometer,
+      'liters': liters,
+      'pricePerLiter': pricePerLiter,
+      'location': location,
+      'imageFileId': imageFileId,
+      'imageFileName': imageFileName,
+      'imageFileUrl': imageFileUrl,
+    };
+  }
+}
diff --git a/lib/home.dart b/lib/pages/appwritetest/home.dart
similarity index 82%
rename from lib/home.dart
rename to lib/pages/appwritetest/home.dart
index f7a79f9..a630c29 100644
--- a/lib/home.dart
+++ b/lib/pages/appwritetest/home.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
-import './data/models/log.dart';
-import './data/models/status.dart';
-import './data/repository/appwrite_repository.dart';
-import './ui/components/checkered_background.dart';
-import './ui/components/collapsible_bottomsheet.dart';
-import './ui/components/connection_status_view.dart';
-import './ui/components/getting_started_cards.dart';
-import './ui/components/top_platform_view.dart';
-import './utils/extensions/build_context.dart';
+import '../../data/models/log.dart';
+import '../../data/models/status.dart';
+import '../../data/repository/appwrite_repository.dart';
+import '../../ui/components/checkered_background.dart';
+import '../../ui/components/collapsible_bottomsheet.dart';
+import '../../ui/components/connection_status_view.dart';
+import '../../ui/components/getting_started_cards.dart';
+import '../../ui/components/top_platform_view.dart';
+import '../../utils/extensions/build_context.dart';
 
 class AppwriteStarterKit extends StatefulWidget {
   const AppwriteStarterKit({super.key});