16 files changed, 9 insertions, 9 deletions
diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/bookmarks/add.php
index c7fd3cf79..c7fd3cf79 100644
--- a/mod/bookmarks/pages/add.php
+++ b/mod/bookmarks/pages/bookmarks/add.php
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/bookmarks/all.php
index 07ae5d327..07ae5d327 100644
--- a/mod/bookmarks/pages/all.php
+++ b/mod/bookmarks/pages/bookmarks/all.php
diff --git a/mod/bookmarks/pages/bookmarklet.php b/mod/bookmarks/pages/bookmarks/bookmarklet.php
index 99866e385..99866e385 100644
--- a/mod/bookmarks/pages/bookmarklet.php
+++ b/mod/bookmarks/pages/bookmarks/bookmarklet.php
diff --git a/mod/bookmarks/pages/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
index 24513a960..24513a960 100644
--- a/mod/bookmarks/pages/edit.php
+++ b/mod/bookmarks/pages/bookmarks/edit.php
diff --git a/mod/bookmarks/pages/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 6e3f77cf6..6e3f77cf6 100644
--- a/mod/bookmarks/pages/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index d1564f751..d1564f751 100644
--- a/mod/bookmarks/pages/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
diff --git a/mod/bookmarks/pages/view.php b/mod/bookmarks/pages/bookmarks/view.php
index 142e0b246..142e0b246 100644
--- a/mod/bookmarks/pages/view.php
+++ b/mod/bookmarks/pages/bookmarks/view.php
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index bf7e372a3..9d0aa362e 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -107,7 +107,7 @@ function bookmarks_page_handler($page) {
 		bookmarks_url_forwarder($page);
 	}
 
-	$pages = dirname(__FILE__) . '/pages';
+	$pages = dirname(__FILE__) . '/pages/bookmarks';
 
 	switch ($page[0]) {
 		case "all":
diff --git a/mod/thewire/pages/everyone.php b/mod/thewire/pages/thewire/everyone.php
index 75abd282d..75abd282d 100644
--- a/mod/thewire/pages/everyone.php
+++ b/mod/thewire/pages/thewire/everyone.php
diff --git a/mod/thewire/pages/friends.php b/mod/thewire/pages/thewire/friends.php
index 6e8642544..6e8642544 100644
--- a/mod/thewire/pages/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
diff --git a/mod/thewire/pages/previous.php b/mod/thewire/pages/thewire/previous.php
index 05fc3267e..05fc3267e 100644
--- a/mod/thewire/pages/previous.php
+++ b/mod/thewire/pages/thewire/previous.php
diff --git a/mod/thewire/pages/reply.php b/mod/thewire/pages/thewire/reply.php
index c29f81669..c29f81669 100644
--- a/mod/thewire/pages/reply.php
+++ b/mod/thewire/pages/thewire/reply.php
diff --git a/mod/thewire/pages/tag.php b/mod/thewire/pages/thewire/tag.php
index 53f9e9db9..53f9e9db9 100644
--- a/mod/thewire/pages/tag.php
+++ b/mod/thewire/pages/thewire/tag.php
diff --git a/mod/thewire/pages/thread.php b/mod/thewire/pages/thewire/thread.php
index 8b6ee4bd0..8b6ee4bd0 100644
--- a/mod/thewire/pages/thread.php
+++ b/mod/thewire/pages/thewire/thread.php
diff --git a/mod/thewire/pages/user.php b/mod/thewire/pages/thewire/user.php
index 5645b23ba..5645b23ba 100644
--- a/mod/thewire/pages/user.php
+++ b/mod/thewire/pages/thewire/user.php
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index c2006ddb0..26a1adbec 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -85,44 +85,44 @@ function thewire_page_handler($page) {
 
 		switch ($page[0]) {
 			case "all":
-				include dirname(__FILE__) . "/pages/everyone.php";
+				include dirname(__FILE__) . "/pages/thewire/everyone.php";
 				break;
 
 			case "friends":
-				include dirname(__FILE__) . "/pages/friends.php";
+				include dirname(__FILE__) . "/pages/thewire/friends.php";
 				break;
 
 			case "owner":
-				include dirname(__FILE__) . "/pages/user.php";
+				include dirname(__FILE__) . "/pages/thewire/user.php";
 				break;
 
 			case "thread":
 				if (isset($page[1])) {
 					set_input('thread_id', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thread.php";
+				include dirname(__FILE__) . "/pages/thewire/thread.php";
 				break;
 			case "reply":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/reply.php";
+				include dirname(__FILE__) . "/pages/thewire/reply.php";
 				break;
 			case "tag":
 				if (isset($page[1])) {
 					set_input('tag', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/tag.php";
+				include dirname(__FILE__) . "/pages/thewire/tag.php";
 				break;
 			case "previous":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/previous.php";
+				include dirname(__FILE__) . "/pages/thewire/previous.php";
 				break;
 		}
 	} else {
-		include dirname(__FILE__) . "/pages/everyone.php";
+		include dirname(__FILE__) . "/pages/thewire/everyone.php";
 	}
 
 	return true;