diff --git a/main/inc/ajax/document.ajax.php b/main/inc/ajax/document.ajax.php
index 2f62bbb734..c60e47ea0d 100755
--- a/main/inc/ajax/document.ajax.php
+++ b/main/inc/ajax/document.ajax.php
@@ -35,7 +35,6 @@ switch ($action) {
         //$ifExists = isset($_POST['if_exists']) ? $_POST['if_exists'] : $defaultFileExistsOption;
 
         if (!empty($_FILES)) {
-            require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
             $file = $_FILES['file'];
             $result = DocumentManager::upload_document(
                 $_FILES,
diff --git a/main/inc/ajax/lp.ajax.php b/main/inc/ajax/lp.ajax.php
index 99a4c48852..ccdcecc96d 100755
--- a/main/inc/ajax/lp.ajax.php
+++ b/main/inc/ajax/lp.ajax.php
@@ -114,8 +114,6 @@ switch ($action) {
             exit;
         }
 
-        require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-        require_once api_get_path(LIBRARY_PATH).'document.lib.php';
         require_once api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php';
 
         foreach (array('video', 'audio') as $type) {
diff --git a/main/inc/course_document.inc.php b/main/inc/course_document.inc.php
index 703218f587..58eb47df01 100755
--- a/main/inc/course_document.inc.php
+++ b/main/inc/course_document.inc.php
@@ -9,11 +9,7 @@ require 'global.inc.php';
 /*	Libraries */
 
 require_once api_get_path(LIBRARY_PATH).'course_document.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fckeditor/repository.php';
 require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-require_once api_get_path(LIBRARY_PATH).'document.lib.php';
-//require_once api_get_path(LIBRARY_PATH).'tablesort.lib.php'; moved to autoload
 require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 
 //if(!$is_in_admin){
@@ -176,7 +172,7 @@ if ($is_allowed_to_edit) { // TEACHER ONLY
 
 $docs_and_folders = getlist ($base_work_dir.'/');
 
-if ($docs_and_folders) {	
+if ($docs_and_folders) {
 	//create a sortable table with our data
 	$sortable_data = array();
 	while (list ($key, $id) = each($docs_and_folders)) {
diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php
index 8debe22125..bfb81676b1 100755
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@@ -107,6 +107,7 @@ require_once $lib_path.'online.inc.php';
 require_once $lib_path.'banner.lib.php';
 require_once $lib_path.'fileManage.lib.php';
 require_once $lib_path.'fileUpload.lib.php';
+require_once $lib_path.'fileDisplay.lib.php';
 
 define('_MPDF_TEMP_PATH', api_get_path(SYS_ARCHIVE_PATH).'mpdf/');
 if (!is_dir(_MPDF_TEMP_PATH)) {
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index f79ff68727..bbf931777d 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -380,6 +380,26 @@ define('CAREER_STATUS_INACTIVE', 0);
 define('PROMOTION_STATUS_ACTIVE',  1);
 define('PROMOTION_STATUS_INACTIVE', 0);
 
+// Group permissions
+define('GROUP_PERMISSION_OPEN', '1');
+define('GROUP_PERMISSION_CLOSED', '2');
+
+// Group user permissions
+define('GROUP_USER_PERMISSION_ADMIN', '1'); // the admin of a group
+define('GROUP_USER_PERMISSION_READER', '2'); // a normal user
+define('GROUP_USER_PERMISSION_PENDING_INVITATION', '3'); // When an admin/moderator invites a user
+define('GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER', '4'); // an user joins a group
+define('GROUP_USER_PERMISSION_MODERATOR', '5'); // a moderator
+define('GROUP_USER_PERMISSION_ANONYMOUS', '6'); // an anonymous user
+define('GROUP_USER_PERMISSION_HRM', '7'); // a human resources manager
+
+define('GROUP_IMAGE_SIZE_ORIGINAL', 1);
+define('GROUP_IMAGE_SIZE_BIG', 2);
+define('GROUP_IMAGE_SIZE_MEDIUM', 3);
+define('GROUP_IMAGE_SIZE_SMALL', 4);
+
+define('GROUP_TITLE_LENGTH', 50);
+
 /**
  * Inclusion of internationalization libraries
  */
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 8664a273d4..886adb1ffd 100755
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -1332,6 +1332,7 @@ class DocumentManager
                         path LIKE BINARY '$path' AND
                         session_id = $sessionId
                     LIMIT 1";
+
             $result = Database::query($sql);
             if (Database::num_rows($result)) {
                 $row = Database::fetch_array($result);
@@ -3665,7 +3666,6 @@ class DocumentManager
         $overwrite_url = null,
         $folderId = false
     ) {
-        require_once api_get_path(LIBRARY_PATH) . 'fileDisplay.lib.php';
         $return = '';
 
         if (!empty($documents)) {
@@ -4612,6 +4612,29 @@ class DocumentManager
         }
     }
 
+    /**
+     * Update the document name
+     * @param int $documentId The document id
+     * @param string $newName The new name
+     */
+    public static function renameDocument($documentId, $newName)
+    {
+        $documentId = intval($documentId);
+        $newName = Database::escape_string($newName);
+
+        $docuentTable = Database::get_course_table(TABLE_DOCUMENT);
+
+        $values = array(
+            'title' => $newName
+        );
+
+        $whereConditions = array(
+            'id = ?' => $documentId
+        );
+
+        Database::update($docuentTable, $values, $whereConditions);
+    }
+
     /**
      * Get folder/file suffix
      *
diff --git a/main/inc/lib/fileDisplay.lib.php b/main/inc/lib/fileDisplay.lib.php
index a321b4c6a9..41e764d5f8 100755
--- a/main/inc/lib/fileDisplay.lib.php
+++ b/main/inc/lib/fileDisplay.lib.php
@@ -6,9 +6,6 @@
 *
 *	@package chamilo.library
 */
-/**
- * Code
- */
 
 /* FILE DISPLAY FUNCTIONS */
 /**
diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 5bdb20b2f7..6ca47a1db7 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -1,26 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-// Group permissions
-define('GROUP_PERMISSION_OPEN', '1');
-define('GROUP_PERMISSION_CLOSED', '2');
-
-// Group user permissions
-define('GROUP_USER_PERMISSION_ADMIN', '1'); // the admin of a group
-define('GROUP_USER_PERMISSION_READER', '2'); // a normal user
-define('GROUP_USER_PERMISSION_PENDING_INVITATION', '3'); // When an admin/moderator invites a user
-define('GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER', '4'); // an user joins a group
-define('GROUP_USER_PERMISSION_MODERATOR', '5'); // a moderator
-define('GROUP_USER_PERMISSION_ANONYMOUS', '6'); // an anonymous user
-define('GROUP_USER_PERMISSION_HRM', '7'); // a human resources manager
-
-define('GROUP_IMAGE_SIZE_ORIGINAL', 1);
-define('GROUP_IMAGE_SIZE_BIG', 2);
-define('GROUP_IMAGE_SIZE_MEDIUM', 3);
-define('GROUP_IMAGE_SIZE_SMALL', 4);
-
-define('GROUP_TITLE_LENGTH', 50);
-
 /**
  * Class GroupPortalManager
  *  This library provides functions for the group management.
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 20a9154d7c..98900941fc 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -3,8 +3,6 @@
 
 require_once api_get_path(LIBRARY_PATH).'online.inc.php';
 require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 
 define('MESSAGE_STATUS_NEW', '0');
 define('MESSAGE_STATUS_UNREAD', '1');
diff --git a/main/inc/lib/nanogong.lib.php b/main/inc/lib/nanogong.lib.php
index 12a0c2fbb4..0029893dd5 100755
--- a/main/inc/lib/nanogong.lib.php
+++ b/main/inc/lib/nanogong.lib.php
@@ -286,8 +286,6 @@ class Nanogong
 	 */
 	public function upload_file($is_nano = false)
 	{
-		require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-		require_once api_get_path(LIBRARY_PATH).'document.lib.php';
 		require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
 
 		if (!empty($_FILES)) {
diff --git a/main/install/index.php b/main/install/index.php
index c7e537b6f5..992ca48220 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -30,7 +30,7 @@ define('MAX_FORM_FIELD_LENGTH',                 80);
 /*		PHP VERSION CHECK */
 
 // Including necessary libraries.
-require_once '../inc/lib/main_api.lib.php';
+require_once '../inc/lib/api.lib.php';
 
 api_check_php_version('../inc/');
 
diff --git a/main/resourcelinker/resourcelinker.inc.php b/main/resourcelinker/resourcelinker.inc.php
index d3e7494e1e..c1e1ef5978 100755
--- a/main/resourcelinker/resourcelinker.inc.php
+++ b/main/resourcelinker/resourcelinker.inc.php
@@ -22,7 +22,6 @@ use \ChamiloSession as Session;
 
 //include(api_get_path(SYS_CODE_PATH).'lang/english/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
 //include(api_get_path(SYS_CODE_PATH).'lang/'.$_course['language'].'/resourcelinker.inc.php'); // TODO: Repeated deleting and moving the rest of this lang file to trad4all
-include_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
 include(api_get_path(SYS_CODE_PATH).'exercice/hotpotatoes.lib.php');
 
 /**
diff --git a/main/work/edit.php b/main/work/edit.php
index 8e109872ad..87f389bdc9 100755
--- a/main/work/edit.php
+++ b/main/work/edit.php
@@ -12,9 +12,6 @@ api_protect_course_script(true);
 
 // Including files
 require_once 'work.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 
 $this_section = SECTION_COURSES;
 
diff --git a/main/work/upload.php b/main/work/upload.php
index 7394481c0c..f5db7ee8ab 100755
--- a/main/work/upload.php
+++ b/main/work/upload.php
@@ -12,9 +12,6 @@ api_protect_course_script(true);
 
 // Including necessary files
 require_once 'work.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 
 $this_section = SECTION_COURSES;
 
diff --git a/main/work/upload_from_template.php b/main/work/upload_from_template.php
index ab7bb79a1f..3d1684122e 100755
--- a/main/work/upload_from_template.php
+++ b/main/work/upload_from_template.php
@@ -12,9 +12,6 @@ api_protect_course_script(true);
 
 // Including necessary files
 require_once 'work.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 
 $this_section = SECTION_COURSES;
 
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 5227a4d816..d135cb0558 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -15,9 +15,6 @@ use ChamiloSession as Session;
  */
 
 require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
 
 $addDocumentToWork = api_get_configuration_value('add_document_to_work');
diff --git a/main/work/work.php b/main/work/work.php
index 8a4e7dd73e..729a3f6ede 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -17,9 +17,6 @@ api_protect_course_script(true);
 require_once 'work.lib.php';
 
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
-require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php';
 
 $course_id      = api_get_course_int_id();
 $course_info    = api_get_course_info();
diff --git a/tests/main/inc/lib/fileDisplay.lib.test.php b/tests/main/inc/lib/fileDisplay.lib.test.php
index 28c6b64c5e..055242f3a5 100755
--- a/tests/main/inc/lib/fileDisplay.lib.test.php
+++ b/tests/main/inc/lib/fileDisplay.lib.test.php
@@ -1,5 +1,4 @@
 <?php
-require_once(api_get_path(LIBRARY_PATH).'fileDisplay.lib.php');
 class TestFileDisplay extends UnitTestCase {
 
 	public function TestFileDisplay(){
diff --git a/tests/test_manager.inc.php b/tests/test_manager.inc.php
index cfa4010444..3c756da765 100755
--- a/tests/test_manager.inc.php
+++ b/tests/test_manager.inc.php
@@ -19,7 +19,7 @@ use \ChamiloSession as Session;
  * @todo check for duplication of "require_once" files with test_suite.php
  * @author Arthur Portugal
  */
- 
+
 /*
 		INIT SECTION
 */
@@ -80,7 +80,7 @@ require_once $libdir.'exercise_show_functions.lib.php';
 require_once $libdir.'fileManage.lib.php';
 require_once $libdir.'notebook.lib.php';
 
-/**This files need be inside a buffering to clean the objects*/ 
+/**This files need be inside a buffering to clean the objects*/
 ob_start();
 require_once $libdir.'main_api.lib.php';
 require_once $libdir.'course_document.lib.php';
@@ -92,7 +92,7 @@ ob_end_clean();
 //require_once $maindir.'exercice/exercise.lib.php';
 
 class TestManager {
-	
+
 /* MAIN CODE */
 
 /**
@@ -103,23 +103,23 @@ class TestManager {
  */
 
 function create_test_course($course_code = 'TESTCOURSE') {
-		
-	/* Table definitions */	
+
+	/* Table definitions */
 	$table_course 		= Database::get_main_table(TABLE_MAIN_COURSE);
 	$course_table 		= Database::get_main_table(TABLE_MAIN_COURSE);
 	$course_cat_table 	= Database::get_main_table(TABLE_MAIN_CATEGORY);
-	
+
 	global $_configuration, $_user, $_course, $cidReq;
 	$cidReq = $course_code;
-	
+
 	/*	Check if the course exists	*/
-	
+
 	$sql = "SELECT code FROM  $table_course WHERE code = '$cidReq' ";
 	$rs = Database::query($sql, __FILE__, __LINE__);
 	$row = Database::fetch_row($rs);
-	
+
 	/*	Create the course in the database */
-	
+
 	if (empty($row[0])) {
 	    // Create a course
 	    $course_data = array(
@@ -137,18 +137,18 @@ function create_test_course($course_code = 'TESTCOURSE') {
 	                         $course_data['course_language'],$course_data['course_admin_id'],
 	                         $course_data['db_prefix'], $course_data['firstExpirationDelay']);
 	}
-	
-	
+
+
 	$sql =  "SELECT course.*, course_category.code faCode, course_category.name faName
 	         FROM $course_table
 	         LEFT JOIN $course_cat_table
 	         ON course.category_code = course_category.code
 	         WHERE course.code = '$cidReq'";
-	         
+
 	$result = Database::query($sql);
-	
+
 	/*	Create the session	*/
-	
+
 	if (Database::num_rows($result)>0) {
 	    $cData = Database::fetch_array($result);
 	    $_cid                            = $cData['code'             ];
@@ -169,24 +169,24 @@ function create_test_course($course_code = 'TESTCOURSE') {
 	    $_course['visibility'  ]         = $cData['visibility'		 ];
 	    $_course['subscribe_allowed']    = $cData['subscribe'		 ];
 	    $_course['unsubscribe']          = $cData['unsubscribe'		 ];
-	
+
 	    Session::write('_cid',$_cid);
 	    Session::write('_course',$_course);
 	}
-	   
+
 	/*	Load the session	*/
-	
-	$_SESSION['_user']['user_id'] = 1;    
+
+	$_SESSION['_user']['user_id'] = 1;
 	$_SESSION['is_courseAdmin'] = 1;
 	$_SESSION['show'] = showall;
-	
+
 	/*		Load the user	*/
-	
+
 	$_user['user_id'] = $_SESSION['_user']['user_id'];
 }
 
 /**
- * This function delete the test course from the database and destroy the sessions. 
+ * This function delete the test course from the database and destroy the sessions.
  * @param string the course code than will be delete.
  * @return void
  */
@@ -194,7 +194,7 @@ function create_test_course($course_code = 'TESTCOURSE') {
 function delete_test_course($course_code = 'TESTCOURSE') {
 	$res = CourseManager::delete_course($course_code);
 	$path = api_get_path(SYS_PATH).'archive';
-	
+
 	if ($handle = opendir($path)) {
 		while (false !== ($file = readdir($handle))) {
 			if (strpos($file,$course_code)!==false) {
@@ -205,7 +205,7 @@ function delete_test_course($course_code = 'TESTCOURSE') {
 		}
 		closedir($handle);
 	}
-		
+
 	//	Check api session destroy
 	if (!headers_sent() && session_id() != "") {
 		$res=Session::destroy();