diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index 19ad1017..024897b9 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -1,11 +1,11 @@
 <link rel="stylesheet" type="text/css"
-        href="<?php echo $base_url; ?>/assets/css/libs/jquery/fullcalendar.css" />
+        href="<?php echo $base_url; ?>/assets/ext/jquery-fullcalendar/jquery.fullcalendar.css" />
 
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/fullcalendar.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-fullcalendar/jquery.fullcalendar.min.js"></script>
 
         <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery-ui-timepicker-addon.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
         
 <script type="text/javascript" 
         src="<?php echo $base_url; ?>/assets/js/backend_calendar.js"></script>
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 866893c1..acf9fb2f 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -1,5 +1,5 @@
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery-ui-timepicker-addon.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
         
 <script type="text/javascript" 
         src="<?php echo $base_url; ?>/assets/js/backend_customers.js"></script>
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index d14c8b00..224ae09f 100644
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -14,19 +14,23 @@
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/jquery/jquery-ui.min.css">
+        href="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/jquery/jquery.qtip.min.css">
+        href="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.css">
+    <link 
+        rel="stylesheet" 
+        type="text/css" 
+        href="<?php echo $base_url; ?>/assets/ext/jquery-jscrollpane/jquery.jscrollpane.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
@@ -35,35 +39,32 @@
         rel="stylesheet" 
         type="text/css" 
         href="<?php echo $base_url; ?>/assets/css/general.css">
-    <link 
-        rel="stylesheet" 
-        type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/jquery/jquery.jscrollpane.css">
+    
     <?php
         // ------------------------------------------------------------
         // INCLUDE JAVASCRIPT FILES 
         // ------------------------------------------------------------ ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery-ui.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.qtip.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/date.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.jscrollpane.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-jscrollpane/jquery.jscrollpane.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.mousewheel.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-mousewheel/jquery.mousewheel.js"></script>
         
     <script type="text/javascript">
     	// Global JavaScript Variables - Used in all backend pages.
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index df23df89..90b91e4b 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -3,9 +3,9 @@
 <script type="text/javascript" 
         src="<?php echo $base_url; ?>/assets/js/working_plan.js"></script>
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery-ui-timepicker-addon.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.jeditable.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-jeditable/jquery.jeditable.min.js"></script>
         
 <script type="text/javascript">    
     var GlobalVariables = {
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index 0e5350bb..05b42f03 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -12,9 +12,9 @@
         src="<?php echo $base_url; ?>/assets/js/working_plan.js"></script>
         
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery-ui-timepicker-addon.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
 <script type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.jeditable.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery-jeditable/jquery.jeditable.min.js"></script>
         
 <script type="text/javascript">    
     var GlobalVariables = {
diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php
index 4e68fe85..b93366e7 100644
--- a/src/application/views/general/error404.php
+++ b/src/application/views/general/error404.php
@@ -11,11 +11,11 @@
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     
     <?php
         // ------------------------------------------------------------
@@ -40,13 +40,13 @@
         // ------------------------------------------------------------ ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/date.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script>
     <script 
         type="text/javascript" 
         src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script>
diff --git a/src/application/views/general/installation.php b/src/application/views/general/installation.php
index b7784dee..1e3deebf 100644
--- a/src/application/views/general/installation.php
+++ b/src/application/views/general/installation.php
@@ -9,11 +9,11 @@
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $base_url; ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     
     <?php // SET FAVICON FOR PAGE ?>
     <link 
@@ -24,13 +24,13 @@
     <?php // INCLUDE SCRIPTS ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $base_url; ?>/assets/js/libs/date.js"></script>
+        src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>
     
     <script type="text/javascript">
 	    var GlobalVariables = {
diff --git a/src/application/views/general/test.php b/src/application/views/general/test.php
index 0f21d6a8..16467583 100644
--- a/src/application/views/general/test.php
+++ b/src/application/views/general/test.php
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+<script type="text/javascript" src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
 <script type="text/javascript">
     $(document).ready(function() {
         var passedTestsNumber = $('span').filter(function() {
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php
index 3049da62..7ee4ffdb 100644
--- a/src/application/views/user/forgot_password.php
+++ b/src/application/views/user/forgot_password.php
@@ -7,13 +7,13 @@
     <?php // INCLUDE JS FILES ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/date.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script>
     
     <script type="text/javascript">
         var EALang = <?php echo json_encode($this->lang->language); ?>;
@@ -23,11 +23,11 @@
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     
     <?php // SET FAVICON FOR PAGE ?>
     <link 
diff --git a/src/application/views/user/login.php b/src/application/views/user/login.php
index 1ad4be3e..17126200 100644
--- a/src/application/views/user/login.php
+++ b/src/application/views/user/login.php
@@ -7,23 +7,23 @@
     <?php // INCLUDE JS FILES ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/date.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script>
         
     <?php // INCLUDE CSS FILES ?>
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
 	<link 
         rel="stylesheet" 
         type="text/css" 
diff --git a/src/application/views/user/logout.php b/src/application/views/user/logout.php
index 91e24242..ac457fc9 100644
--- a/src/application/views/user/logout.php
+++ b/src/application/views/user/logout.php
@@ -7,10 +7,10 @@
     <?php // INCLUDE JS FILES ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>   
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>   
     
     <script type="text/javascript">
         var EALang = <?php echo json_encode($this->lang->language); ?>;
@@ -20,11 +20,11 @@
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     
     <?php // SET FAVICON FOR PAGE ?>
     <link 
diff --git a/src/application/views/user/no_privileges.php b/src/application/views/user/no_privileges.php
index 9c1a4ce4..1d5b5ec9 100644
--- a/src/application/views/user/no_privileges.php
+++ b/src/application/views/user/no_privileges.php
@@ -7,20 +7,20 @@
     <?php // INCLUDE JS FILES ?>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/jquery/jquery.min.js"></script>
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
     <script 
         type="text/javascript" 
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/libs/bootstrap/bootstrap.min.js"></script>   
+        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>   
         
     <?php // INCLUDE CSS FILES ?>
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
     <link 
         rel="stylesheet" 
         type="text/css" 
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/libs/bootstrap/bootstrap-responsive.css">
+        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap-theme.min.css">
     
     <?php // SET FAVICON FOR PAGE ?>
     <link