diff --git a/Tubes2/build/web/WEB-INF/classes/controller/ControllerServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/ControllerServlet.class
deleted file mode 100644
index afe367a627adfd59a0a1f0f158629daa52597080..0000000000000000000000000000000000000000
Binary files a/Tubes2/build/web/WEB-INF/classes/controller/ControllerServlet.class and /dev/null differ
diff --git a/Tubes2/build/web/WEB-INF/classes/controller/HistoryServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/HistoryServlet.class
index 4ad6f1d45ba03dbca1e1ec691eb73b5e605c24ac..26864270267885271357528e2d0b54941abd9310 100644
Binary files a/Tubes2/build/web/WEB-INF/classes/controller/HistoryServlet.class and b/Tubes2/build/web/WEB-INF/classes/controller/HistoryServlet.class differ
diff --git a/Tubes2/build/web/WEB-INF/classes/controller/LoginServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/LoginServlet.class
index 9b7abc396e489a6150ebaad91d8df48c6a296af4..02b3ea74618e0f8bf7da5ff281492a64c20e0c59 100644
Binary files a/Tubes2/build/web/WEB-INF/classes/controller/LoginServlet.class and b/Tubes2/build/web/WEB-INF/classes/controller/LoginServlet.class differ
diff --git a/Tubes2/build/web/WEB-INF/classes/controller/OrderServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/OrderServlet.class
new file mode 100644
index 0000000000000000000000000000000000000000..226c02f20d233e211ffbd1f2e2ffbd134a469d4d
Binary files /dev/null and b/Tubes2/build/web/WEB-INF/classes/controller/OrderServlet.class differ
diff --git a/Tubes2/build/web/WEB-INF/classes/controller/ProfileServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/ProfileServlet.class
index fb527ef0f8f1427fa5b6760cb216f44028c3a7e7..65a370443b67670ad63c98351ff66da2b88f9133 100644
Binary files a/Tubes2/build/web/WEB-INF/classes/controller/ProfileServlet.class and b/Tubes2/build/web/WEB-INF/classes/controller/ProfileServlet.class differ
diff --git a/Tubes2/build/web/WEB-INF/classes/controller/RegistrasiServlet.class b/Tubes2/build/web/WEB-INF/classes/controller/RegistrasiServlet.class
index 4d5dcf33d58c2f19569d8152012ca900060413d0..3c11b392f88c7c7a4a455dd069b68c0f83b6c28c 100644
Binary files a/Tubes2/build/web/WEB-INF/classes/controller/RegistrasiServlet.class and b/Tubes2/build/web/WEB-INF/classes/controller/RegistrasiServlet.class differ
diff --git a/Tubes2/build/web/WEB-INF/view/History.jsp b/Tubes2/build/web/WEB-INF/view/history/History.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/History.jsp
rename to Tubes2/build/web/WEB-INF/view/history/History.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/Login.jsp b/Tubes2/build/web/WEB-INF/view/login/Login.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/Login.jsp
rename to Tubes2/build/web/WEB-INF/view/login/Login.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/CompleteOrder.jsp b/Tubes2/build/web/WEB-INF/view/order/CompleteOrder.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/CompleteOrder.jsp
rename to Tubes2/build/web/WEB-INF/view/order/CompleteOrder.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/Order.jsp b/Tubes2/build/web/WEB-INF/view/order/Order.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/Order.jsp
rename to Tubes2/build/web/WEB-INF/view/order/Order.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/SelectDriver.jsp b/Tubes2/build/web/WEB-INF/view/order/SelectDriver.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/SelectDriver.jsp
rename to Tubes2/build/web/WEB-INF/view/order/SelectDriver.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/EditPrefLoc.jsp b/Tubes2/build/web/WEB-INF/view/profile/EditPrefLoc.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/EditPrefLoc.jsp
rename to Tubes2/build/web/WEB-INF/view/profile/EditPrefLoc.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/EditProfile.jsp b/Tubes2/build/web/WEB-INF/view/profile/EditProfile.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/EditProfile.jsp
rename to Tubes2/build/web/WEB-INF/view/profile/EditProfile.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/Profile.jsp b/Tubes2/build/web/WEB-INF/view/profile/Profile.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/Profile.jsp
rename to Tubes2/build/web/WEB-INF/view/profile/Profile.jsp
diff --git a/Tubes2/build/web/WEB-INF/view/Signup.jsp b/Tubes2/build/web/WEB-INF/view/signup/Signup.jsp
similarity index 100%
rename from Tubes2/build/web/WEB-INF/view/Signup.jsp
rename to Tubes2/build/web/WEB-INF/view/signup/Signup.jsp
diff --git a/Tubes2/src/java/controller/HistoryServlet.java b/Tubes2/src/java/controller/HistoryServlet.java
index f45a41f14ee2fc07b2c7c7d1e9666afaad6b24fc..88b140170c32d7fb4761dafc1011d167c827ec92 100644
--- a/Tubes2/src/java/controller/HistoryServlet.java
+++ b/Tubes2/src/java/controller/HistoryServlet.java
@@ -34,7 +34,7 @@ public class HistoryServlet extends HttpServlet {
         String userPath = request.getServletPath();
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/history" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
@@ -64,7 +64,7 @@ public class HistoryServlet extends HttpServlet {
         } 
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/history" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
diff --git a/Tubes2/src/java/controller/LoginServlet.java b/Tubes2/src/java/controller/LoginServlet.java
index a213944e42c9ad575538958a24a198a3ba48e400..a69888842122532bd27e3b1ce3aef8bc5ba335f0 100644
--- a/Tubes2/src/java/controller/LoginServlet.java
+++ b/Tubes2/src/java/controller/LoginServlet.java
@@ -34,7 +34,7 @@ public class LoginServlet extends HttpServlet {
         String userPath = request.getServletPath();
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/login" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
@@ -64,7 +64,7 @@ public class LoginServlet extends HttpServlet {
         } 
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/login" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
diff --git a/Tubes2/src/java/controller/ControllerServlet.java b/Tubes2/src/java/controller/OrderServlet.java
similarity index 89%
rename from Tubes2/src/java/controller/ControllerServlet.java
rename to Tubes2/src/java/controller/OrderServlet.java
index f73fb57182f45082b9608654af71d783418e53e1..8b5792d3e541bff9f3475816db859658a6f1a14c 100644
--- a/Tubes2/src/java/controller/ControllerServlet.java
+++ b/Tubes2/src/java/controller/OrderServlet.java
@@ -17,8 +17,8 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author nim_13515091
  */
-@WebServlet(name = "ControllerServlet", urlPatterns = {"/Order", "/CompleteOrder", "/SelectDriver"})
-public class ControllerServlet extends HttpServlet {
+@WebServlet(name = "OrderServlet", urlPatterns = {"/Order", "/CompleteOrder", "/SelectDriver"})
+public class OrderServlet extends HttpServlet {
 
     /**
      * Handles the HTTP <code>GET</code> method.
@@ -34,7 +34,7 @@ public class ControllerServlet extends HttpServlet {
         String userPath = request.getServletPath();
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/order" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
@@ -72,7 +72,7 @@ public class ControllerServlet extends HttpServlet {
         }
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/order" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
diff --git a/Tubes2/src/java/controller/ProfileServlet.java b/Tubes2/src/java/controller/ProfileServlet.java
index 514d159f14afe2458cb864c13209852f77307759..d4b4931b1316ad5072007250be64be5a6a5c614c 100644
--- a/Tubes2/src/java/controller/ProfileServlet.java
+++ b/Tubes2/src/java/controller/ProfileServlet.java
@@ -34,7 +34,7 @@ public class ProfileServlet extends HttpServlet {
         String userPath = request.getServletPath();
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/profile" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
@@ -72,7 +72,7 @@ public class ProfileServlet extends HttpServlet {
         }
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/profile" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
diff --git a/Tubes2/src/java/controller/RegistrasiServlet.java b/Tubes2/src/java/controller/RegistrasiServlet.java
index b1f34de7ad3d5a77a1a47f9f2aa07d219fbfe46a..78793ca94c83650e135d15bd50c6cdfd2c9cf9f3 100644
--- a/Tubes2/src/java/controller/RegistrasiServlet.java
+++ b/Tubes2/src/java/controller/RegistrasiServlet.java
@@ -34,7 +34,7 @@ public class RegistrasiServlet extends HttpServlet {
         String userPath = request.getServletPath();
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/signup" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
@@ -64,7 +64,7 @@ public class RegistrasiServlet extends HttpServlet {
         }
 
         // use RequestDispatcher to forward request internally
-        String url = "/WEB-INF/view" + userPath + ".jsp";
+        String url = "/WEB-INF/view/signup" + userPath + ".jsp";
 
         try {
             request.getRequestDispatcher(url).forward(request, response);
diff --git a/Tubes2/web/WEB-INF/view/History.jsp b/Tubes2/web/WEB-INF/view/history/History.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/History.jsp
rename to Tubes2/web/WEB-INF/view/history/History.jsp
diff --git a/Tubes2/web/WEB-INF/view/Login.jsp b/Tubes2/web/WEB-INF/view/login/Login.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/Login.jsp
rename to Tubes2/web/WEB-INF/view/login/Login.jsp
diff --git a/Tubes2/web/WEB-INF/view/CompleteOrder.jsp b/Tubes2/web/WEB-INF/view/order/CompleteOrder.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/CompleteOrder.jsp
rename to Tubes2/web/WEB-INF/view/order/CompleteOrder.jsp
diff --git a/Tubes2/web/WEB-INF/view/Order.jsp b/Tubes2/web/WEB-INF/view/order/Order.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/Order.jsp
rename to Tubes2/web/WEB-INF/view/order/Order.jsp
diff --git a/Tubes2/web/WEB-INF/view/SelectDriver.jsp b/Tubes2/web/WEB-INF/view/order/SelectDriver.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/SelectDriver.jsp
rename to Tubes2/web/WEB-INF/view/order/SelectDriver.jsp
diff --git a/Tubes2/web/WEB-INF/view/EditPrefLoc.jsp b/Tubes2/web/WEB-INF/view/profile/EditPrefLoc.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/EditPrefLoc.jsp
rename to Tubes2/web/WEB-INF/view/profile/EditPrefLoc.jsp
diff --git a/Tubes2/web/WEB-INF/view/EditProfile.jsp b/Tubes2/web/WEB-INF/view/profile/EditProfile.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/EditProfile.jsp
rename to Tubes2/web/WEB-INF/view/profile/EditProfile.jsp
diff --git a/Tubes2/web/WEB-INF/view/Profile.jsp b/Tubes2/web/WEB-INF/view/profile/Profile.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/Profile.jsp
rename to Tubes2/web/WEB-INF/view/profile/Profile.jsp
diff --git a/Tubes2/web/WEB-INF/view/Signup.jsp b/Tubes2/web/WEB-INF/view/signup/Signup.jsp
similarity index 100%
rename from Tubes2/web/WEB-INF/view/Signup.jsp
rename to Tubes2/web/WEB-INF/view/signup/Signup.jsp