diff --git a/src/complete-order/index.html b/src/complete-order.html
similarity index 100%
rename from src/complete-order/index.html
rename to src/complete-order.html
diff --git a/src/complete-order/img/rattata.png b/src/complete-order/img/rattata.png
deleted file mode 100644
index 13ca75a24de257fbb87cf8dc10bf4450edba4c20..0000000000000000000000000000000000000000
Binary files a/src/complete-order/img/rattata.png and /dev/null differ
diff --git a/src/public/css/styles.css b/src/css/styles.css
similarity index 100%
rename from src/public/css/styles.css
rename to src/css/styles.css
diff --git a/src/complete-order/css/stylesheet.css b/src/css/stylesheet.css
similarity index 100%
rename from src/complete-order/css/stylesheet.css
rename to src/css/stylesheet.css
diff --git a/src/public/css/stylesheet.css b/src/css/stylesheet2.css
similarity index 100%
rename from src/public/css/stylesheet.css
rename to src/css/stylesheet2.css
diff --git a/src/order-ojek/css/stylesheet.css b/src/css/stylesheet3.css
similarity index 100%
rename from src/order-ojek/css/stylesheet.css
rename to src/css/stylesheet3.css
diff --git a/src/edit-prefered-location/edit-prefered-location.html b/src/edit-prefered-location.html
similarity index 81%
rename from src/edit-prefered-location/edit-prefered-location.html
rename to src/edit-prefered-location.html
index 43f9b2fa0405efdea1dace50dc924d414d004767..bed89d76dfed984c0b9d79bc8b4a5fa3903c9518 100644
--- a/src/edit-prefered-location/edit-prefered-location.html
+++ b/src/edit-prefered-location.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Edit Prefered Location</title>
- <link rel="stylesheet" href="../public/css/styles.css">
+ <link rel="stylesheet" href="css/styles.css">
</head>
<body>
<nav>
@@ -26,8 +26,8 @@
<td></td>
<td>
<ul>
- <li><a href="#"><img src="public/pencil.png" alt="edit"></a></li>
- <li><a href="#"><img src="public/delete.png" alt="delete"></a></li>
+ <li><a href="#"><img src="img/pencil.png" alt="edit"></a></li>
+ <li><a href="#"><img src="img/delete.png" alt="delete"></a></li>
</ul>
</td>
</tr>
diff --git a/src/history/history.html b/src/history-driver.html
similarity index 88%
rename from src/history/history.html
rename to src/history-driver.html
index a961f3eba7899f9090d03daefe0e14aa83801ef2..8b60d33255a8a9a0bcdf874f0dd58e66011f2afd 100644
--- a/src/history/history.html
+++ b/src/history-driver.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>History</title>
- <link type="text/css" rel="stylesheet" href="../public/css/stylesheet.css"/>
+ <link type="text/css" rel="stylesheet" href="css/stylesheet2.css"/>
</head>
<body>
<div class="page-header">
@@ -33,7 +33,7 @@
</div>
</div>
<div class="item">
- <img src="public/e46_m3_motor.jpg" alt="profile picture">
+ <img src="img/e46_m3_motor.jpg" alt="profile picture">
Minggu, 1 Oktober 2017 <br>M3 <br>
Bandung-Solo <br>
diff --git a/src/public/delete.png b/src/img/delete.png
similarity index 100%
rename from src/public/delete.png
rename to src/img/delete.png
diff --git a/src/public/e46_m3_motor.jpg b/src/img/e46_m3_motor.jpg
similarity index 100%
rename from src/public/e46_m3_motor.jpg
rename to src/img/e46_m3_motor.jpg
diff --git a/src/public/pencil.png b/src/img/pencil.png
similarity index 100%
rename from src/public/pencil.png
rename to src/img/pencil.png
diff --git a/src/login/login.html b/src/login.html
old mode 100755
new mode 100644
similarity index 93%
rename from src/login/login.html
rename to src/login.html
index 30491b7d10c8e7e8ea68547ebc1e230748478c61..61c3ba87c26bef7b49c48e4386eb7c194a59092c
--- a/src/login/login.html
+++ b/src/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Login</title>
- <link rel="stylesheet" href="public/css/styles.css">
+ <link rel="stylesheet" href="css/styles.css">
</head>
<body>
<nav>
diff --git a/src/order-ojek/index.html b/src/order-ojek.html
similarity index 95%
rename from src/order-ojek/index.html
rename to src/order-ojek.html
index 76730bdc23f735b7b3b8fbb1b56206a0dde0bb57..28c57a05ebc7537c6aaee3bd8bb71924d6cba6cb 100644
--- a/src/order-ojek/index.html
+++ b/src/order-ojek.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Order ojek</title>
- <link type="text/css" rel="stylesheet" href="css/stylesheet.css"/>
+ <link type="text/css" rel="stylesheet" href="css/stylesheet3.css"/>
</head>
<body>
diff --git a/src/sign-up/register.html b/src/register.html
old mode 100755
new mode 100644
similarity index 96%
rename from src/sign-up/register.html
rename to src/register.html
index 1993e29621f6a63d0d042a1339df441a2839775d..0d47b5d0ac462370939d37531b6affc4616ea56b
--- a/src/sign-up/register.html
+++ b/src/register.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Sign Up</title>
- <link rel="stylesheet" href="public/css/styles.css">
+ <link rel="stylesheet" href="css/styles.css">
</head>
<body>
<nav>