diff --git a/backend/images/D-pad.png b/client/backend/images/D-pad.png
similarity index 100%
rename from backend/images/D-pad.png
rename to client/backend/images/D-pad.png
diff --git a/backend/images/D-pad_blank.png b/client/backend/images/D-pad_blank.png
similarity index 100%
rename from backend/images/D-pad_blank.png
rename to client/backend/images/D-pad_blank.png
diff --git a/backend/images/D-pad_center.png b/client/backend/images/D-pad_center.png
similarity index 100%
rename from backend/images/D-pad_center.png
rename to client/backend/images/D-pad_center.png
diff --git a/backend/images/D-pad_left.png b/client/backend/images/D-pad_left.png
similarity index 100%
rename from backend/images/D-pad_left.png
rename to client/backend/images/D-pad_left.png
diff --git a/backend/images/D-pad_up.png b/client/backend/images/D-pad_up.png
similarity index 100%
rename from backend/images/D-pad_up.png
rename to client/backend/images/D-pad_up.png
diff --git a/backend/js/Node.js b/client/backend/js/Node.js
similarity index 100%
rename from backend/js/Node.js
rename to client/backend/js/Node.js
diff --git a/backend/js/Topic.js b/client/backend/js/Topic.js
similarity index 100%
rename from backend/js/Topic.js
rename to client/backend/js/Topic.js
diff --git a/backend/js/ros_scripts.js b/client/backend/js/ros_scripts.js
similarity index 100%
rename from backend/js/ros_scripts.js
rename to client/backend/js/ros_scripts.js
diff --git a/backend/js/update_guis.js b/client/backend/js/update_guis.js
similarity index 100%
rename from backend/js/update_guis.js
rename to client/backend/js/update_guis.js
diff --git a/coordinator/coordinator.html b/client/coordinator/coordinator.html
similarity index 100%
rename from coordinator/coordinator.html
rename to client/coordinator/coordinator.html
diff --git a/coordinator/js/ros_scripts.js b/client/coordinator/js/ros_scripts.js
similarity index 100%
rename from coordinator/js/ros_scripts.js
rename to client/coordinator/js/ros_scripts.js
diff --git a/coordinator/js/update_guis.js b/client/coordinator/js/update_guis.js
similarity index 100%
rename from coordinator/js/update_guis.js
rename to client/coordinator/js/update_guis.js
diff --git a/include/css/bootstrap.min.css b/client/include/css/bootstrap.min.css
similarity index 100%
rename from include/css/bootstrap.min.css
rename to client/include/css/bootstrap.min.css
diff --git a/include/js/bootstrap.min.js b/client/include/js/bootstrap.min.js
similarity index 100%
rename from include/js/bootstrap.min.js
rename to client/include/js/bootstrap.min.js
diff --git a/include/js/eventemitter2.min.js b/client/include/js/eventemitter2.min.js
similarity index 100%
rename from include/js/eventemitter2.min.js
rename to client/include/js/eventemitter2.min.js
diff --git a/include/js/jquery.min.js b/client/include/js/jquery.min.js
similarity index 100%
rename from include/js/jquery.min.js
rename to client/include/js/jquery.min.js
diff --git a/include/js/math.min.js b/client/include/js/math.min.js
similarity index 100%
rename from include/js/math.min.js
rename to client/include/js/math.min.js
diff --git a/include/js/roslib.js b/client/include/js/roslib.js
similarity index 100%
rename from include/js/roslib.js
rename to client/include/js/roslib.js
diff --git a/include/js/roslib.min.js b/client/include/js/roslib.min.js
similarity index 100%
rename from include/js/roslib.min.js
rename to client/include/js/roslib.min.js
diff --git a/index.html b/client/index.html
similarity index 95%
rename from index.html
rename to client/index.html
index 03dcc09..d6370a6 100644
--- a/index.html
+++ b/client/index.html
@@ -3,18 +3,12 @@
     <head>
         <meta charset="utf-8" />
         <title>Lab UI</title>
-        <!--
-Link to included files. These are typically done by fetching from the web.
-Because this needs to run without an internet conection, the files were saved
-locally
--->
-        <script type="text/javascript" src="include/js/eventemitter2.min.js"></script>
 
-
-        <!--    Bootstrap is a beatuful and usefull library of GUIs. Docs can be found here: http://getbootstrap.com/
-Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
--->
         <link rel="stylesheet" href="include/css/bootstrap.min.css">
+
+
+        <script type="text/javascript" src="include/js/eventemitter2.min.js"></script>
+                
         <script src="include/js/jquery.min.js"></script>
         <script src="include/js/bootstrap.min.js"></script>
         <script src="include/js/math.min.js"></script>
@@ -29,7 +23,6 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
 
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-
         <script>
             $(function(){
                 $("#coordinatorContent").load("coordinator/coordinator.html");
diff --git a/vision/js/ros_scripts.js b/client/vision/js/ros_scripts.js
similarity index 100%
rename from vision/js/ros_scripts.js
rename to client/vision/js/ros_scripts.js
diff --git a/vision/js/update_guis.js b/client/vision/js/update_guis.js
similarity index 100%
rename from vision/js/update_guis.js
rename to client/vision/js/update_guis.js
diff --git a/vision/vision.html b/client/vision/vision.html
similarity index 100%
rename from vision/vision.html
rename to client/vision/vision.html
