diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 37e04cb6188d445bf336b85a54acb3c9b3dabc70..0eadc728519de89e749b901c58594ba9e18ab4f2 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -13,8 +13,9 @@ datasource db {
 
 model User {
   id          Int       @id @default(autoincrement())
-  email String
+  username    String @unique
   name    String
+  email String @unique
   password    String
   saldo       Float     @default(0.0)
   histories   History[]
diff --git a/src/history/history.router.ts b/src/handler/history/history.router.ts
similarity index 92%
rename from src/history/history.router.ts
rename to src/handler/history/history.router.ts
index 08a6e62cb19512817f23940fc1f8e190421097ea..4ec93972e61e5653d8a8bda1e9332e51eb4cfcc3 100644
--- a/src/history/history.router.ts
+++ b/src/handler/history/history.router.ts
@@ -1,6 +1,5 @@
 import express from "express";
 import type { Request, Response } from "express";
-// import { body, validationResult } from "express-validator";
 
 import * as HistoryServices from './history.service'
 
diff --git a/src/history/history.service.ts b/src/handler/history/history.service.ts
similarity index 71%
rename from src/history/history.service.ts
rename to src/handler/history/history.service.ts
index 840fe1c5127ba0e8f2467c3f22119b9e1d6bade9..4dacade8f2bed6a9ce2c2450d5a430a82ee580ce 100644
--- a/src/history/history.service.ts
+++ b/src/handler/history/history.service.ts
@@ -1,20 +1,6 @@
-import {db} from "../utils/db.server"
-
-
-type History = {
-    id: number,
-    user_id : number,
-    alamat_tujuan: string,
-    nama_penerima: string,
-    rating: number,
-}
-
-type HistoryDetail = {
-    id: number,
-    history_id : number,
-    product_name: string,
-    quantity: number,
-}
+import { History } from "../../interfaces/History";
+import { HistoryDetail } from "../../interfaces/HistoryDetail";
+import {db} from "../../utils/db.server"
 
 export const getHistory = async (): Promise<History[]> => {
     const user_id = 2; //ini buat temp aja karena auth belom dibuat
diff --git a/src/user/user.service.ts b/src/handler/user/user.router.ts
similarity index 100%
rename from src/user/user.service.ts
rename to src/handler/user/user.router.ts
diff --git a/src/handler/user/user.service.ts b/src/handler/user/user.service.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/index.ts b/src/index.ts
index fa61d82960ac9f939c303ede8872a75385d0abbb..8340e8f7e5ce1197519d7845ad453715889dc642 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,5 @@
 import express, {Express, Request, Response} from "express";
-import { HistoryRouter } from "./history/history.router";
+import { HistoryRouter } from "./handler/history/history.router";
 
 const app = express();
 const port = 5000;
diff --git a/src/interfaces/History.ts b/src/interfaces/History.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3d85e7f05bdf724121012422d19523db2d1c9b05
--- /dev/null
+++ b/src/interfaces/History.ts
@@ -0,0 +1,8 @@
+
+export interface History {
+    id: number,
+    user_id : number,
+    alamat_tujuan: string,
+    nama_penerima: string,
+    rating: number,
+}
diff --git a/src/interfaces/HistoryDetail.ts b/src/interfaces/HistoryDetail.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6c769d4c92781f65e6ecc54fe8d12d366f28cdf4
--- /dev/null
+++ b/src/interfaces/HistoryDetail.ts
@@ -0,0 +1,7 @@
+
+export interface HistoryDetail {
+    id: number,
+    history_id : number,
+    product_name: string,
+    quantity: number,
+}
\ No newline at end of file