diff --git a/Routes.php b/Routes.php
index b009827..6ce9039 100644
--- a/Routes.php
+++ b/Routes.php
@@ -2,10 +2,10 @@
 <html>
 <head>
     <title>uBus - Routes</title>
-    <?php include 'head.php'; ?>
+    <?php include 'modules/head.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
 
 <h1>Routes</h1>
 <p>This is a table of all the routes. Click on a route's name to see a list of 
@@ -22,7 +22,7 @@ to see a list of routes that have this line number</p>
 
 
 <?php
-include 'libdata.php';
+include 'modules/libdata.php';
 
 foreach ($routes as $route){
     echo '<tr>';
@@ -37,7 +37,7 @@ foreach ($routes as $route){
 </table>
 
 
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/ShowLine.php b/ShowLine.php
index 1f791f0..f290d13 100644
--- a/ShowLine.php
+++ b/ShowLine.php
@@ -2,10 +2,10 @@
 <html>
 <head>
     <title>uBus - ShowLine</title>
-    <?php include 'head.php'; ?>
+    <?php include 'modules/head.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
 
 <h1>ShowLine</h1>
 <p>Here you can find a list of routes that have a specified line number. Click 
@@ -15,7 +15,7 @@ on the map.</p>
 
 
 <?php
-include 'libdata.php';
+include 'modules/libdata.php';
 
 if (isValidLine($_GET["line"])){
     echo '<header><h1>Line ' . $_GET["line"] . '</h1></header>';
@@ -39,7 +39,7 @@ function PrintRoutes($line){
 
 
 
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/ShowRoute.php b/ShowRoute.php
index c79406d..514bc86 100644
--- a/ShowRoute.php
+++ b/ShowRoute.php
@@ -2,10 +2,10 @@
 <html>
 <head>
     <title>uBus - ShowRoute</title>
-    <?php include 'head.php'; ?>
+    <?php include 'modules/head.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
 
 <h1>ShowRoute</h1>
 <p>There are two tables below that list the bus stops of a route; one for each 
@@ -15,7 +15,7 @@ and view its position on a map.</p>
 
 
 <?php
-include 'libdata.php';
+include 'modules/libdata.php';
 
 if (isValidRoute($_GET['route'])){
     $route = getRouteInfo($_GET['route']);
@@ -41,11 +41,7 @@ function PrintStops($rt,$dir){
 
 
 
-</tbody>
-</table>
-
-
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/ShowStop.php b/ShowStop.php
index 7b93ff1..329ac29 100644
--- a/ShowStop.php
+++ b/ShowStop.php
@@ -2,11 +2,11 @@
 <html>
 <head>
     <title>uBus - ShowStop</title>
-    <?php include 'head.php'; ?>
-    <?php include 'map.php'; ?>
+    <?php include 'modules/head.php'; ?>
+    <?php include 'modules/map.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
 
 <h1>ShowStop</h1>
 <p>Below you can find two tables. One of them shows a list of routes tha visit 
@@ -16,7 +16,7 @@ is also a map showing the location of the requested stop.</p>
 
 
 <?php
-include 'libdata.php';
+include 'modules/libdata.php';
 
 if (isValidStop($_GET["stop"])){
     $stop=getStopInfo($_GET["stop"]);
@@ -58,7 +58,7 @@ function PrintRoutes($stp){
 
 
 
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/Stops.php b/Stops.php
index 80c7700..71511b3 100644
--- a/Stops.php
+++ b/Stops.php
@@ -2,10 +2,10 @@
 <html>
 <head>
     <title>uBus - Stops</title>
-    <?php include 'head.php'; ?>
+    <?php include 'modules/head.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
 
 <h1>Stops</h1>
 <p>This is a table of all the bus stops. Click on a stop's name to view its 
@@ -22,7 +22,7 @@ on their way to it.</p>
 
 
 <?php
-include 'libdata.php';
+include 'modules/libdata.php';
 
 foreach ($stops as $stop){
     echo '<tr>';
@@ -37,7 +37,7 @@ foreach ($stops as $stop){
 </table>
 
 
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/index.php b/index.php
index 83bdafd..1195de2 100644
--- a/index.php
+++ b/index.php
@@ -2,10 +2,10 @@
 <html>
 <head>
     <title>uBus - Home</title>
-    <?php include 'head.php'; ?>
+    <?php include 'modules/head.php'; ?>
 </head>
 <body>
-<?php include 'nav.php'; ?>
+<?php include 'modules/nav.php'; ?>
     <h1>Home</h1>
     <p>uBus is a generic web application that displays data regading buses, 
     routes and stops of public transport bus services. It uses  modern web 
@@ -16,7 +16,7 @@
 
 
 
-<?php include 'foot.php'; ?>
+<?php include 'modules/foot.php'; ?>
 </body>
 </html
 
diff --git a/modules/data.php b/modules/data.php
index 69524a6..b11b719 100644
--- a/modules/data.php
+++ b/modules/data.php
@@ -1,5 +1,5 @@
 <?php
-$routes  = json_decode(file_get_contents("routes.json"), true);
-$stops  = json_decode(file_get_contents("stops.json"), true);
-$busposition  = json_decode(file_get_contents("busposition.json"), true);
+$routes  = json_decode(file_get_contents("data/routes.json"), true);
+$stops  = json_decode(file_get_contents("data/stops.json"), true);
+$busposition  = json_decode(file_get_contents("data/busposition.json"), true);
 ?>
