diff --git a/lam/lib/tools/multiEdit.inc b/lam/lib/tools/multiEdit.inc
index 12fdc3e8..2857ec46 100644
--- a/lam/lib/tools/multiEdit.inc
+++ b/lam/lib/tools/multiEdit.inc
@@ -60,7 +60,7 @@ class toolMultiEdit implements \LAMTool {
 	 * @return string link
 	 */
 	function getLink() {
-		return "multiEdit.php";
+		return "tools/multiEdit.php";
 	}
 
 	/**
diff --git a/lam/lib/tools/ouEditor.inc b/lam/lib/tools/ouEditor.inc
index 4c8c3ef4..84c3aba2 100644
--- a/lam/lib/tools/ouEditor.inc
+++ b/lam/lib/tools/ouEditor.inc
@@ -60,7 +60,7 @@ class toolOUEditor implements \LAMTool {
 	 * @return string link
 	 */
 	function getLink() {
-		return "ou_edit.php";
+		return "tools/ou_edit.php";
 	}
 
 	/**
diff --git a/lam/lib/tools/serverInfo.inc b/lam/lib/tools/serverInfo.inc
index bce1a008..2e9b072b 100644
--- a/lam/lib/tools/serverInfo.inc
+++ b/lam/lib/tools/serverInfo.inc
@@ -60,7 +60,7 @@ class toolServerInformation implements \LAMTool {
 	 * @return string link
 	 */
 	function getLink() {
-		return "serverInfo.php";
+		return "tools/serverInfo.php";
 	}
 
 	/**
diff --git a/lam/templates/multiEdit.php b/lam/templates/tools/multiEdit.php
similarity index 97%
rename from lam/templates/multiEdit.php
rename to lam/templates/tools/multiEdit.php
index 42bd20ff..6924837f 100644
--- a/lam/templates/multiEdit.php
+++ b/lam/templates/tools/multiEdit.php
@@ -4,10 +4,8 @@ use \htmlTable;
 use \htmlTitle;
 use \htmlSelect;
 use \htmlOutputText;
-use \htmlHelpLink;
 use \htmlInputField;
 use \htmlSubTitle;
-use \htmlTableExtendedInputField;
 use \htmlButton;
 use \htmlStatusMessage;
 use \htmlSpacer;
@@ -50,13 +48,13 @@ use \htmlResponsiveTable;
 */
 
 /** security functions */
-include_once("../lib/security.inc");
+include_once("../../lib/security.inc");
 /** access to configuration data */
-include_once("../lib/config.inc");
+include_once("../../lib/config.inc");
 /** access LDAP server */
-include_once("../lib/ldap.inc");
+include_once("../../lib/ldap.inc");
 /** used to print status messages */
-include_once("../lib/status.inc");
+include_once("../../lib/status.inc");
 
 // start session
 startSecureSession();
@@ -95,7 +93,7 @@ else {
  */
 function displayStartPage() {
 	// display main page
-	include '../lib/adminHeader.inc';
+	include '../../lib/adminHeader.inc';
 	echo '<div class="user-bright smallPaddingContent">';
 	echo "<form action=\"multiEdit.php\" method=\"post\">\n";
 	$errors = array();
@@ -205,7 +203,7 @@ function displayStartPage() {
 	parseHtml(null, $container, array(), false, $tabindex, 'user');
 	echo ("</form>\n");
 	echo '</div>';
-	include '../lib/adminFooter.inc';
+	include '../../lib/adminFooter.inc';
 }
 
 /**
@@ -465,10 +463,10 @@ function dryRun() {
 	$container->addVerticalSpace('20px');
 	// store LDIF
 	$filename = 'ldif' . getRandomNumber() . '.ldif';
-	$out = @fopen(dirname(__FILE__) . '/../tmp/' . $filename, "wb");
+	$out = @fopen(dirname(__FILE__) . '/../../tmp/' . $filename, "wb");
 	fwrite($out, $ldif);
 	$container->addElement(new htmlOutputText(_('LDIF file')), true);
-	$ldifLink = new htmlLink($filename, '../tmp/' . $filename);
+	$ldifLink = new htmlLink($filename, '../../tmp/' . $filename);
 	$ldifLink->setTargetWindow('_blank');
 	$container->addElement($ldifLink, true);
 	$container->addVerticalSpace('20px');
diff --git a/lam/templates/ou_edit.php b/lam/templates/tools/ou_edit.php
similarity index 96%
rename from lam/templates/ou_edit.php
rename to lam/templates/tools/ou_edit.php
index 2dca066d..cdb49bf8 100644
--- a/lam/templates/ou_edit.php
+++ b/lam/templates/tools/ou_edit.php
@@ -40,13 +40,13 @@ use \htmlGroup;
 */
 
 /** security functions */
-include_once("../lib/security.inc");
+include_once("../../lib/security.inc");
 /** access to configuration data */
-include_once("../lib/config.inc");
+include_once("../../lib/config.inc");
 /** access LDAP server */
-include_once("../lib/ldap.inc");
+include_once("../../lib/ldap.inc");
 /** used to print status messages */
-include_once("../lib/status.inc");
+include_once("../../lib/status.inc");
 
 // start session
 startSecureSession();
@@ -118,7 +118,7 @@ if (isset($_POST['createOU']) || isset($_POST['deleteOU'])) {
 		$info = ldap_get_entries($_SESSION['ldap']->server(), $sr);
 		if ($sr && $info['count'] == 0) {
 			// print header
-			include 'main_header.php';
+			include '../main_header.php';
 			echo '<div class="user-bright smallPaddingContent">';
 			echo "<form action=\"ou_edit.php\" method=\"post\">\n";
 			$tabindex = 1;
@@ -142,7 +142,7 @@ if (isset($_POST['createOU']) || isset($_POST['deleteOU'])) {
 			parseHtml(null, $container, array(), false, $tabindex, 'user');
 			echo "</form>";
 			echo '</div>';
-			include 'main_footer.php';
+			include '../main_footer.php';
 			exit();
 		}
 		else {
@@ -161,7 +161,7 @@ display_main($message, $error);
  */
 function display_main($message, $error) {
 	// display main page
-	include '../lib/adminHeader.inc';
+	include '../../lib/adminHeader.inc';
 	echo '<div class="user-bright smallPaddingContent">';
 	echo "<form action=\"ou_edit.php\" method=\"post\">\n";
 
@@ -230,5 +230,5 @@ function display_main($message, $error) {
 	parseHtml(null, $container, array(), false, $tabindex, 'user');
 	echo ("</form>\n");
 	echo '</div>';
-	include '../lib/adminFooter.inc';
+	include '../../lib/adminFooter.inc';
 }
diff --git a/lam/templates/serverInfo.php b/lam/templates/tools/serverInfo.php
similarity index 99%
rename from lam/templates/serverInfo.php
rename to lam/templates/tools/serverInfo.php
index eed221ab..06dd0b2b 100644
--- a/lam/templates/serverInfo.php
+++ b/lam/templates/tools/serverInfo.php
@@ -28,9 +28,9 @@
 */
 
 /** security functions */
-include_once("../lib/security.inc");
+include_once("../../lib/security.inc");
 /** access to configuration options */
-include_once("../lib/config.inc");
+include_once("../../lib/config.inc");
 
 // start session
 startSecureSession();
@@ -94,7 +94,7 @@ foreach ($monitorResults as $monitorResult) {
 }
 $monitorEntries = array_change_key_case($monitorEntries, CASE_LOWER);
 
-include '../lib/adminHeader.inc';
+include '../../lib/adminHeader.inc';
 echo '<div class="user-bright smallPaddingContent">';
 $tabindex = 1;
 $container = new htmlResponsiveRow();
@@ -364,6 +364,6 @@ elseif (isset($monitorEntries['cn=monitor']['opsinitiated'])) {
 parseHtml(null, $container, array(), true, $tabindex, 'user');
 
 echo '</div>';
-include '../lib/adminFooter.inc';
+include '../../lib/adminFooter.inc';
 
 ?>