diff --git a/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php b/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php
deleted file mode 100644
index fd49b5f18..000000000
--- a/e107_plugins/tagwords/e_url/apache_mod_rewrite/main.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id$
- *
- * eURL configuration script
-*/
-
-if (!defined('e107_INIT')) { exit; }
-
-require_once(e_HANDLER.'news_class.php');
-define('TAGWORDS_REWRITE', true);
-
-function url_tagwords_main($parms = array())
-{
-	//$base = e_HTTP.$sefbase.$parms['action'];
-	$base = e_HTTP.(e107::getPref('tagwords_sefbase') ? e107::getPref('tagwords_sefbase').'/' : 'tagwords/');
-	return $base.urlencode(varset($parms['q']));
-}
-
-function parse_url_tagwords_main($request)
-{
-	$request = urldecode($request);
-	parse_str($request, $request);
-
-	if(isset($request['q']))
-	{
-		return array('q' => $request['q']);
-	}
-	
-	return $request;
-}
-
diff --git a/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml b/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml
deleted file mode 100644
index 52c95485f..000000000
--- a/e107_plugins/tagwords/e_url/apache_mod_rewrite/profile.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<urlprofile>
-	<title>{LAN_EURL_MODREWR_TITLE}</title>
-	<description>{LAN_EURL_MODREWR_DESCR}</description>
-</urlprofile>
diff --git a/e107_plugins/tagwords/e_url/main.php b/e107_plugins/tagwords/e_url/main.php
deleted file mode 100644
index 3d9fca6ce..000000000
--- a/e107_plugins/tagwords/e_url/main.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id$
- *
- * eURL configuration script
-*/
-
-if (!defined('e107_INIT')) { exit; }
-define('TAGWORDS_REWRITE', false);
-
-function url_tagwords_main($parms = array())
-{
-	$base = e_PLUGIN_ABS.'tagwords/tagwords.php';
-	if(isset($parms['q'])) return $base.'?q='.urlencode(varset($parms['q']));
-	return $base;
-
-}
-
-function parse_url_tagwords_main($request)
-{
-	parse_str($request, $parsed);
-	return $parsed;
-}
diff --git a/e107_plugins/tagwords/e_url.php b/e107_plugins/tagwords/url/url.php
similarity index 100%
rename from e107_plugins/tagwords/e_url.php
rename to e107_plugins/tagwords/url/url.php