diff --git a/core/inc/shortcodes.php b/core/inc/shortcodes.php
index 477efbf..ad291c6 100644
--- a/core/inc/shortcodes.php
+++ b/core/inc/shortcodes.php
@@ -1,23 +1,14 @@
 <?php
 
-// Create Shortcode wppedia_navigation
-// Shortcode: [wppedia_navigation]
-function create_wppedia_navigation_shortcode() {
-
-	ob_start();
-	wppedia_get_template_part('nav/char', 'navigation');
-	return ob_get_clean();
-
-}
-add_shortcode( 'wppedia_navigation', 'create_wppedia_navigation_shortcode' );
-
-// Create Shortcode wppedia_searchform
-// Shortcode: [wppedia_searchform]
-function create_wppedia_searchform_shortcode() {
-
-	ob_start();
-	wppedia_get_template_part('search/form');
-	return ob_get_clean();
-
-}
-add_shortcode( 'wppedia_searchform', 'create_wppedia_searchform_shortcode' );
+/**
+ * Register custom shortcodes
+ * the code for shortcodes is available in the shortcodes
+ * folder
+ * 
+ * @since 1.1.5
+ */
+
+defined( 'ABSPATH' ) || die();
+
+require_once __DIR__ . '/shortcodes/navigation.php';
+require_once __DIR__ . '/shortcodes/searchform.php';
diff --git a/core/inc/shortcodes/navigation.php b/core/inc/shortcodes/navigation.php
new file mode 100644
index 0000000..f017664
--- /dev/null
+++ b/core/inc/shortcodes/navigation.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Register shortcode to display the WPPedia initial char
+ * navigation
+ * 
+ * @shortcode_name wppedia_navigation
+ * @usage [wppedia_navigation]
+ * 
+ * @since 1.1.5
+ */
+
+defined( 'ABSPATH' ) || die();
+
+function create_wppedia_navigation_shortcode() {
+
+	ob_start();
+	wppedia_get_template_part('nav/char', 'navigation');
+	return ob_get_clean();
+
+}
+add_shortcode( 'wppedia_navigation', 'create_wppedia_navigation_shortcode' );
\ No newline at end of file
diff --git a/core/inc/shortcodes/searchform.php b/core/inc/shortcodes/searchform.php
new file mode 100644
index 0000000..11e110f
--- /dev/null
+++ b/core/inc/shortcodes/searchform.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Register shortcode to display the WPPedia searchform
+ * 
+ * @shortcode_name wppedia_searchform
+ * @usage [wppedia_searchform]
+ * 
+ * @since 1.1.5
+ */
+
+defined( 'ABSPATH' ) || die();
+ 
+function create_wppedia_searchform_shortcode() {
+
+	ob_start();
+	wppedia_get_template_part('search/form');
+	return ob_get_clean();
+
+}
+add_shortcode( 'wppedia_searchform', 'create_wppedia_searchform_shortcode' );
\ No newline at end of file