diff --git a/e107_plugins/forum/e_url/forum.php b/e107_plugins/forum/e_url/forum.php
deleted file mode 100644
index 5c00e4ddd..000000000
--- a/e107_plugins/forum/e_url/forum.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// $Id$
-// DEPRECATED - subject of removal
-function url_forum_forum($parms)
-{
-	$amp = isset($parms['raw']) ? '&' : '&amp;';
-	switch($parms['func'])
-	{
-		case 'view':
-			$page = (varset($parms['page']) ? $amp.'p='.$parms['page'] : '');
-			return e_PLUGIN_ABS."forum/forum_viewforum.php?id={$parms['id']}{$page}";
-			break;
-
-		case 'track':
-			return e_PLUGIN_ABS.'forum/forum.php?track';
-			break;
-
-		case 'main':
-			return e_PLUGIN_ABS.'forum/forum.php';
-			break;
-
-		case 'post':
-			return e_PLUGIN_ABS."forum/forum_post.php?f={$parms['type']}}id={$parms['id']}";
-			break;
-
-		case 'rules':
-			return e_PLUGIN_ABS.'forum/forum.php?f=rules';
-			break;
-
-		case 'mfar':
-			return e_PLUGIN_ABS.'forum/forum.php?f=mfar'.$amp.'id='.$parms['id'];
-			break;
-
-	}
-}
diff --git a/e107_plugins/forum/e_url/thread.php b/e107_plugins/forum/e_url/thread.php
deleted file mode 100644
index 84922755a..000000000
--- a/e107_plugins/forum/e_url/thread.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-// $Id$
-// DEPRECATED - subject of removal
-function url_forum_thread($parms)
-{
-	$amp = isset($parms['raw']) ? '&' : '&amp;';
-	switch($parms['func'])
-	{
-
-		case 'nt':
-			return e_PLUGIN_ABS."forum/forum_post.php?f=nt{$amp}id={$parms['id']}";
-			break;
-
-		case 'rp':
-			return e_PLUGIN_ABS."forum/forum_post.php?f=rp{$amp}id={$parms['id']}";
-			break;
-
-		case 'view':
-			$page = (varset($parms['page']) ? $amp.'p='.$parms['page'] : '');
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?id={$parms['id']}{$page}";
-			break;
-
-		case 'last':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?id={$parms['id']}{$amp}last=1";
-			break;
-
-		case 'post':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=post{$amp}id={$parms['id']}";
-			break;
-
-		case 'report':
-			$page = (isset($parms['page']) ? (int)$parms['page'] : 0 );
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=report{$amp}id={$parms['id']}{$amp}post={$parms['post']}{$amp}p={$page}";
-			break;
-
-		case 'edit':
-			return e_PLUGIN_ABS."forum/forum_post.php?f=edit{$amp}id={$parms['id']}";
-			break;
-
-		case 'move':
-			return e_PLUGIN_ABS."forum/forum_conf.php?f=move{$amp}id={$parms['id']}";
-			break;
-
-		case 'split':
-			return e_PLUGIN_ABS."forum/forum_conf.php?f=split{$amp}id={$parms['id']}";
-			break;
-
-		case 'quote':
-			return e_PLUGIN_ABS."forum/forum_post.php?f=quote{$amp}id={$parms['id']}";
-			break;
-
-		case 'next':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=next{$amp}id={$parms['id']}";
-			break;
-
-		case 'prev':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=prev{$amp}id={$parms['id']}";
-			break;
-
-		case 'track':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=track{$amp}id={$parms['id']}";
-			break;
-
-		case 'untrack':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=untrack{$amp}id={$parms['id']}";
-			break;
-
-		case 'track_toggle':
-			return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=track_toggle{$amp}id={$parms['id']}";
-			break;
-
-	}
-}
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 82f77e7ef..f7b97668e 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -575,7 +575,7 @@ function forumjump()
 	{
 		$text .= "\n<option value='".$key."'>".$val."</option>";
 	}
-	$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='".LAN_03."' />&nbsp;&nbsp;&nbsp;&nbsp;<a href='".e_SELF."?".$_SERVER['QUERY_STRING']."#top'>".LAN_02."</a></p></form>";
+	$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='".LAN_03."' /></form>";
 	return $text;
 }
 
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index 7301f8721..de6f32e7e 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -378,7 +378,7 @@ function forumjump()
 	{
 		$text .= "\n<option value='" . $key . "'>" . $val . "</option>";
 	}
-	$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='" . LAN_03 . "' />&nbsp;&nbsp;&nbsp;&nbsp;<a href='" . e_SELF . "?" . e_QUERY . "#top' onclick=\"window.scrollTo(0,0);\">" . LAN_10 . "</a></p></form>";
+	$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='" . LAN_03 . "' /></form>";
 	return $text;
 }
 
diff --git a/e107_plugins/forum/url/rewrite/e_url.php b/e107_plugins/forum/url/rewrite_url.php
similarity index 100%
rename from e107_plugins/forum/url/rewrite/e_url.php
rename to e107_plugins/forum/url/rewrite_url.php
diff --git a/e107_plugins/forum/e_url.php b/e107_plugins/forum/url/url.php
similarity index 93%
rename from e107_plugins/forum/e_url.php
rename to e107_plugins/forum/url/url.php
index 37471e5e9..421aaca00 100644
--- a/e107_plugins/forum/e_url.php
+++ b/e107_plugins/forum/url/url.php
@@ -1,11 +1,11 @@
 <?php
 
 /*
-* Copyright (C) 2008-2011 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-* $Id$
-*
-* Forum Default URL configuration
-* TODO - SEF URL configuration
+ * Copyright (C) 2008-2011 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * $Id$
+ *
+ * Forum Default URL configuration
+ * TODO - SEF URL configuration
 */
 class plugin_forum_url extends eUrlConfig
 {