diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 233d6c739..665047d09 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -935,11 +935,11 @@ class e107
 	 * <code><?php
 	 * // core news shortcodes
 	 * e107::getScObject('news');
-	 * // object of plugin_myplugin_my_shortcodes class -> myplugin/core/shortcodes/batch/my_shortcodes.php
+	 * // object of plugin_myplugin_my_shortcodes class -> myplugin/shortcodes/batch/my_shortcodes.php
 	 * e107::getScObject('my', 'myplugin');
-	 * // news override - plugin_myplugin_news_shortcodes extends news_shortcodes -> myplugin/core/shortcodes/batch/news_shortcodes.php
+	 * // news override - plugin_myplugin_news_shortcodes extends news_shortcodes -> myplugin/shortcodes/batch/news_shortcodes.php
 	 * e107::getScObject('news', 'myplugin', true);
-	 * // news override - plugin_myplugin_mynews_shortcodes extends news_shortcodes -> myplugin/core/shortcodes/batch/mynews_shortcodes.php
+	 * // news override - plugin_myplugin_mynews_shortcodes extends news_shortcodes -> myplugin/shortcodes/batch/mynews_shortcodes.php
 	 * e107::getScObject('news', 'myplugin', 'mynews');
 	 * </code>
 	 *
@@ -2818,7 +2818,7 @@ class e107
 				// read the todo for e_shortcode.php related problems
 				if('shortcodes' == $end)
 				{
-					$filename = e_PLUGIN.$tmp[0].'/core/shortcodes/batch/'; // plugname/core/shortcodes/batch/
+					$filename = e_PLUGIN.$tmp[0].'/shortcodes/batch/'; // plugname/shortcodes/batch/
 					unset($tmp[0]);
 					$filename .= implode('_', $tmp).'_shortcodes.php'; // my_shortcodes.php
 					break;
diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index 8f7533f14..67528ee80 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -252,11 +252,11 @@ class e_parse_shortcode
 	 * // simple use
 	 * e107::getScParser()->getScObject('news_shortcodes');
 	 *
-	 * // plugin override - e107_plugins/myplug/core/shortcodes/batch/news_shortcodes.php -> class plugin_myplug_news_shortcodes
+	 * // plugin override - e107_plugins/myplug/shortcodes/batch/news_shortcodes.php -> class plugin_myplug_news_shortcodes
 	 * e107::getScParser()->getScObject('news_shortcodes', 'myplug', true);
 	 *
 	 * // more complex plugin override
-	 * // e107_plugins/myplug/core/shortcodes/batch/news2_shortcodes.php -> class plugin_myplug_news2_shortcodes
+	 * // e107_plugins/myplug/shortcodes/batch/news2_shortcodes.php -> class plugin_myplug_news2_shortcodes
 	 * e107::getScParser()->getScObject('news_shortcodes', 'myplug', 'news2_shortcodes');
 	 * </code>
 	 * @param string $className
@@ -289,7 +289,7 @@ class e_parse_shortcode
 			return $this->scClasses[$className];
 		}
 
-		$path = ($pluginName ? e_PLUGIN.$pluginName.'/core/shortcodes/batch/' : e_CORE.'shortcodes/batch/').$_class_fname.'.php';
+		$path = ($pluginName ? e_PLUGIN.$pluginName.'/shortcodes/batch/' : e_CORE.'shortcodes/batch/').$_class_fname.'.php';
 		if (is_readable($path))
 		{
 			require_once($path);
diff --git a/e107_plugins/forum/core/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php
similarity index 100%
rename from e107_plugins/forum/core/shortcodes/batch/post_shortcodes.php
rename to e107_plugins/forum/shortcodes/batch/post_shortcodes.php
diff --git a/e107_plugins/forum/core/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
similarity index 100%
rename from e107_plugins/forum/core/shortcodes/batch/view_shortcodes.php
rename to e107_plugins/forum/shortcodes/batch/view_shortcodes.php