diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
index f382165a6..12bc9526a 100644
--- a/application/views/system/logs/logsViewer.php
+++ b/application/views/system/logs/logsViewer.php
@@ -5,7 +5,6 @@
 		'bootstrap5' => true,
 		'fontawesome6' => true,
 		'jquery3' => true,
-		'restclient' => true,
 		'tablesorter2' => true,
 		'vue3' => true,
 		'filtercomponent' => true,
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index aa724def8..6c6f58b8f 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -38,7 +38,6 @@
 	$filterwidget = isset($filterwidget) ? $filterwidget : false;
 	$navigationcomponent = isset($navigationcomponent) ? $navigationcomponent : false;
 	$navigationwidget = isset($navigationwidget) ? $navigationwidget : false;
-	$restclient = isset($restclient) ? $restclient : false;
 	$tablecomponent = isset($tablecomponent) ? $tablecomponent : false;
 	$tablewidget = isset($tablewidget) ? $tablewidget : false;
 	$udfs = isset($udfs) ? $udfs : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c6e4d2a24..00da589c1 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -132,9 +132,6 @@
 	// PhrasesLib JS
 	if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js');
 
-	// RESTClient
-	if ($restclient === true) generateJSsInclude('public/js/RESTClient.js');
-
 	// TableWidget JS
 	if ($tablewidget === true) generateJSsInclude('public/js/TableWidget.js');
 
diff --git a/public/js/RESTClient.js b/public/js/RESTClient.js
index eb0ebaa63..df2113076 100644
--- a/public/js/RESTClient.js
+++ b/public/js/RESTClient.js
@@ -35,7 +35,7 @@ const CRC_HTTP_POST_METHOD = "post";
 /**
  * Definition and initialization of the object CoreRESTClient
  */
-const CoreRESTClient = {
+export const CoreRESTClient = {
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
diff --git a/public/js/apps/LogsViewer.js b/public/js/apps/LogsViewer.js
index 97ab3eac8..abaf74193 100644
--- a/public/js/apps/LogsViewer.js
+++ b/public/js/apps/LogsViewer.js
@@ -1,5 +1,5 @@
-import {CoreFilterCmpt} from '../components/Filter.js';
-import {CoreNavigationCmpt} from '../components/Navigation.js';
+import {CoreFilterCmpt} from '../components/filter/Filter.js';
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
 
 const logsViewerApp = Vue.createApp({
 	data() {
diff --git a/public/js/components/navigation/API.js b/public/js/components/navigation/API.js
new file mode 100644
index 000000000..541aa69ba
--- /dev/null
+++ b/public/js/components/navigation/API.js
@@ -0,0 +1,38 @@
+import {CoreRESTClient} from '../../RESTClient.js';
+
+const CORE_NAVIGATION_CMPT_TIMEOUT = 2000;
+
+/**
+ *
+ */
+export const CoreNavigationAPIs = {
+	/**
+	 *
+	 */
+	getHeader: function(navigationPage) {
+		return CoreRESTClient.get(
+			'system/Navigation/header',
+			{
+				navigation_page: navigationPage
+			},
+			{
+				timeout: CORE_NAVIGATION_CMPT_TIMEOUT
+			}
+		);
+	},
+	/**
+	 *
+	 */
+	getMenu: function(navigationPage) {
+		return CoreRESTClient.get(
+			'system/Navigation/menu',
+			{
+				navigation_page: navigationPage
+			},
+			{
+				timeout: CORE_NAVIGATION_CMPT_TIMEOUT
+			}
+		);
+	}
+}
+
diff --git a/public/js/components/Navigation.js b/public/js/components/navigation/Navigation.js
similarity index 91%
rename from public/js/components/Navigation.js
rename to public/js/components/navigation/Navigation.js
index fae490b3e..40f079978 100644
--- a/public/js/components/Navigation.js
+++ b/public/js/components/navigation/Navigation.js
@@ -1,4 +1,6 @@
-import {CoreFetchCmpt} from '../components/Fetch.js';
+import {CoreNavigationAPIs} from './API.js';
+import {CoreRESTClient} from '../../RESTClient.js';
+import {CoreFetchCmpt} from '../../components/Fetch.js';
 
 export const CoreNavigationCmpt = {
 	data() {
@@ -20,23 +22,13 @@ export const CoreNavigationCmpt = {
 			return FHC_JS_DATA_STORAGE_OBJECT.called_path + "/" + FHC_JS_DATA_STORAGE_OBJECT.called_method;
 		},
 		fetchDataHeader() {
-			return CoreRESTClient.get(
-				'system/Navigation/header',
-				{
-					navigation_page: this.getNavigationPage()
-				}
-			);
+			return CoreNavigationAPIs.getHeader(this.getNavigationPage());
 		},
 		setHeaders(data) {
 			if (CoreRESTClient.hasData(data)) this.headerMenu = CoreRESTClient.getData(data);
 		},
 		fetchDataMenu() {
-			return CoreRESTClient.get(
-				'system/Navigation/menu',
-				{
-					navigation_page: this.getNavigationPage()
-				}
-			);
+			return CoreNavigationAPIs.getMenu(this.getNavigationPage());
 		},
 		setSideMenu(data) {
 			if (CoreRESTClient.hasData(data)) this.sideMenu = CoreRESTClient.getData(data);