9 files changed, 5 insertions, 5 deletions
diff --git a/mod/file/edit.php b/mod/file/pages/file/edit.php
index 66529af0b..66529af0b 100644
--- a/mod/file/edit.php
+++ b/mod/file/pages/file/edit.php
diff --git a/mod/file/friends.php b/mod/file/pages/file/friends.php
index 65fc66f62..65fc66f62 100644
--- a/mod/file/friends.php
+++ b/mod/file/pages/file/friends.php
diff --git a/mod/file/index.php b/mod/file/pages/file/index.php
index 617e4c7f4..617e4c7f4 100644
--- a/mod/file/index.php
+++ b/mod/file/pages/file/index.php
diff --git a/mod/file/search.php b/mod/file/pages/file/search.php
index bcaa2cad9..2fa1ea60f 100644
--- a/mod/file/search.php
+++ b/mod/file/pages/file/search.php
@@ -3,10 +3,7 @@
  * List files by type
  *
  * @package ElggFile
-
  */
-// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $page_owner_guid = get_input('page_owner', null);
 if ($page_owner_guid) {
diff --git a/mod/file/upload.php b/mod/file/pages/file/upload.php
index c19522530..c19522530 100644
--- a/mod/file/upload.php
+++ b/mod/file/pages/file/upload.php
diff --git a/mod/file/view.php b/mod/file/pages/file/view.php
index 1d7c27337..1d7c27337 100644
--- a/mod/file/view.php
+++ b/mod/file/pages/file/view.php
diff --git a/mod/file/world.php b/mod/file/pages/file/world.php
index a55dcb452..a55dcb452 100644
--- a/mod/file/world.php
+++ b/mod/file/pages/file/world.php
diff --git a/mod/file/start.php b/mod/file/start.php
index f7642c166..f49c6fc91 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -86,7 +86,7 @@ function file_page_handler($page) {
 		$page[0] = 'all';
 	}
 
-	$file_dir = elgg_get_plugins_path() . 'file';
+	$file_dir = elgg_get_plugins_path() . 'file/pages/file';
 
 	$page_type = $page[0];
 	switch ($page_type) {
@@ -107,6 +107,9 @@ function file_page_handler($page) {
 			set_input('guid', $page[1]);
 			include "$file_dir/edit.php";
 			break;
+		case 'search':
+			include "$file_dir/search.php";
+			break;
 		case 'group':
 			include "$file_dir/index.php";
 			break;
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index c0db7932b..ce4d6c127 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -4,7 +4,7 @@
  */
 
 function file_type_cloud_get_url($type, $friends) {
-	$url = elgg_get_site_url() . "mod/file/search.php?subtype=file";
+	$url = elgg_get_site_url() . 'file/search?subtype=file';
 
 	if ($type->tag != "all") {
 		$url .= "&md_type=simpletype&tag=" . urlencode($type->tag);