diff --git a/include/constant.php b/include/constant.php
index 302f249dd..992e8913e 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -359,248 +359,32 @@ if (!defined("DEFAULT_SERVER_VIDEO_CONF")) {
 function noalyss_class_autoloader($class)
 {
     $class = strtolower($class);
+    foreach (array("class","lib","database") as $path) {
+        if ( file_exists(NOALYSS_INCLUDE.'/'.$path.'/'.$class.'.class.php')) {
+            require_once  NOALYSS_INCLUDE.'/'.$path.'/'.$class.'.class.php';
+            return;
+        }
+
+    }
     $aClass = array(
         "database" => "class/database.class.php",
-        "user" => "class/user.class.php",
-        "acc_account" => "class/acc_account.class.php",
-        "acc_account_ledger" => "class/acc_account_ledger.class.php",
-        "acc_balance" => "class/acc_balance.class.php",
-        "acc_bilan" => "class/acc_bilan.class.php",
-        "acc_compute" => "class/acc_compute.class.php",
-        "acc_currency" => "class/acc_currency.class.php",
-        "acc_ledger" => "class/acc_ledger.class.php",
-        "acc_ledger_fin" => "class/acc_ledger_fin.class.php",
-        "acc_ledger_history" => "class/acc_ledger_history.class.php",
-        "acc_ledger_history_financial" => "class/acc_ledger_history_financial.class.php",
-        "acc_ledger_history_generic" => "class/acc_ledger_history_generic.class.php",
-        "acc_ledger_history_purchase" => "class/acc_ledger_history_purchase.class.php",
-        "acc_ledger_history_sale" => "class/acc_ledger_history_sale.class.php",
-        "acc_ledger_info" => "class/acc_ledger_info.class.php",
-        "acc_ledger_purchase" => "class/acc_ledger_purchase.class.php",
-        "acc_ledger_search" => "class/acc_ledger_search.class.php",
-        "acc_ledger_sale" => "class/acc_ledger_sale.class.php",
-        "acc_operation" => "class/acc_operation.class.php",
         "acc_detail" => "class/acc_operation.class.php",
         "acc_sold" => "class/acc_operation.class.php",
         "acc_misc" => "class/acc_operation.class.php",
         "acc_purchase" => "class/acc_operation.class.php",
         "acc_fin" => "class/acc_operation.class.php",
-        "acc_parm_code" => "class/acc_parm_code.class.php",
-        "acc_payment" => "class/acc_payment.class.php",
-        "acc_plan_mtable" => "class/acc_plan_mtable.class.php",
-        "acc_reconciliation" => "class/acc_reconciliation.class.php",
-        "acc_report" => "class/acc_report.class.php",
-        "acc_report_mtable" => "class/acc_report_mtable.class.php",
-        "acc_tva" => "class/acc_tva.class.php",
-        "action_document_type_mtable" => "class/action_document_type_mtable.class.php",
-        "admin" => "class/admin.class.php",
-        "anc_acc_link" => "class/anc_acc_link.class.php",
-        "anc_acc_list" => "class/anc_acc_list.class.php",
-        "anc_account" => "class/anc_account.class.php",
-        "anc_account_table" => "class/anc_account_table.class.php",
-        "anc_balance_double" => "class/anc_balance_double.class.php",
-        "anc_balance_simple" => "class/anc_balance_simple.class.php",
-        "anc_grandlivre" => "class/anc_grandlivre.class.php",
-        "anc_group" => "class/anc_group.class.php",
-        "anc_group_operation" => "class/anc_group_operation.class.php",
-        "anc_key" => "class/anc_key.class.php",
-        "anc_listing" => "class/anc_listing.class.php",
-        "anc_operation" => "class/anc_operation.class.php",
-        "anc_plan" => "class/anc_plan.class.php",
-        "anc_print" => "class/anc_print.class.php",
-        "anc_table" => "class/anc_table.class.php",
-        "anticipation" => "class/anticipation.class.php",
-        "balance_age" => "class/balance_age.class.php",
-        "bank" => "class/bank.class.php",
-        "calendar" => "class/calendar.class.php",
-        "card_attribut_mtable" => "class/card_attribut_mtable.class.php",
-        "card_multiple" => "class/card_multiple.class.php",
-        "class_acc_account_ledger.php~" => "class/class_acc_account_ledger.php~",
-        "contact" => "class/contact.class.php",
-        "contact_option_ref_mtable" => "class/contact_option_ref_mtable.class.php",
-        "currency_mtable" => "class/currency_mtable.class.php",
-        "customer" => "class/customer.class.php",
-        "database" => "class/database.class.php",
-        "data_currency_operation" => "class/data_currency_operation.class.php",
-        "default_menu" => "class/default_menu.class.php",
-        "document" => "class/document.class.php",
-        "document_export" => "class/document_export.class.php",
-        "document_modele" => "class/document_modele.class.php",
-        "document_option" => "class/document_option.class.php",
-        "document_state_mtable.php" => "class/document_state_mtable.php",
-        "document_type" => "class/document_type.class.php",
-        "dossier" => "class/dossier.class.php",
-        "exercice" => "class/exercice.class.php",
-        "extension" => "class/extension.class.php",
-        "fiche" => "class/fiche.class.php",
-        "fiche_def" => "class/fiche_def.class.php",
-        "fiche_def_ref" => "class/fiche_def_ref.class.php",
-        "filter_data_currency_accounting" => "class/filter_data_currency_accounting.class.php",
-        "filter_data_currency_card_category" => "class/filter_data_currency_card_category.class.php",
-        "filter_data_currency_card" => "class/filter_data_currency_card.class.php",
-        "follow_up" => "class/follow_up.class.php",
-        "follow_up_detail" => "class/follow_up_detail.class.php",
-        "follow_up_other_concerned" => "class/follow_up_other_concerned.class.php",
-        "forecast_category_mtable" => "class/forecast_category_mtable.class.php",
-        "forecast" => "class/forecast.class.php",
-        "forecast_item_mtable" => "class/forecast_item_mtable.class.php",
-        "lettering" => "class/lettering.class.php",
         "lettering_card" => "class/lettering.class.php",
         "lettering_account" => "class/lettering.class.php",
-        "manager" => "class/manager.class.php",
-        "menu_ref" => "class/menu_ref.class.php",
-        "noalyss_parameter_folder" => "class/noalyss_parameter_folder.class.php",
-        "operation_category_card" => "class/operation_category_card.class.php",
-        "operation_category_currency_account" => "class/operation_category_currency_account.class.php",
-        "operation_predef_mtable" => "class/operation_predef_mtable.class.php",
-        "package_contrib" => "class/package_contrib.class.php",
-        "package_core" => "class/package_core.class.php",
-        "package_noalyss" => "class/package_noalyss.class.php",
-        "package_plugin" => "class/package_plugin.class.php",
-        "package_repository" => "class/package_repository.class.php",
-        "package_template" => "class/package_template.class.php",
-        "parameter_extra_mtable" => "class/parameter_extra_mtable.class.php",
-        "payment_method_mtable" => "class/payment_method_mtable.class.php",
-        "pdfbalance_simple" => "class/pdfbalance_simple.class.php",
-        "pdf" => "class/pdf.class.php",
-        "pdf_land" => "class/pdf_land.class.php",
-        "pdf_operation" => "class/pdf_operation.class.php",
-        "periode" => "class/periode.class.php",
-        "periode_ledger" => "class/periode_ledger.class.php",
-        "periode_ledger_table" => "class/periode_ledger_table.class.php",
-        "periode_mtable.notused" => "class/periode_mtable.class.php.notused",
-        "pre_op_ach" => "class/pre_op_ach.class.php",
-        "pre_op_advanced" => "class/pre_op_advanced.class.php",
-        "pre_operation" => "class/pre_operation.class.php",
-        "pre_op_fin" => "class/pre_op_fin.class.php",
-        "pre_op_ods" => "class/pre_op_ods.class.php",
-        "pre_op_ven" => "class/pre_op_ven.class.php",
-        "prepared_query" => "class/prepared_query.class.php",
-        "print_ledger" => "class/print_ledger.class.php",
-        "print_ledger_detail" => "class/print_ledger_detail.class.php",
-        "print_ledger_detail_item" => "class/print_ledger_detail_item.class.php",
         "print_ledger_financial" => "class/print_ledger_fin.class.php",
-        "print_ledger_misc" => "class/print_ledger_misc.class.php",
-        "print_ledger_simple" => "class/print_ledger_simple.class.php",
-        "print_ledger_simple_without_vat" => "class/print_ledger_simple_without_vat.class.php",
-        "print_operation_currency" => "class/print_operation_currency.class.php",
-        "profile_menu" => "class/profile_menu.class.php",
-        "sendmail" => "class/sendmail.class.php",
-        "stock" => "class/stock.class.php",
-        "stock_goods" => "class/stock_goods.class.php",
-        "supplier" => "class/supplier.class.php",
-        "tag_action" => "class/tag_action.class.php",
-        "tag" => "class/tag.class.php",
-        "tag_group_mtable" => "class/tag_group_mtable.class.php",
-        "tag_operation" => "class/tag_operation.class.php",
-        "tax_summary" => "class/tax_summary.class.php",
-        "template_card_category" => "class/template_card_category.class.php",
-        "todo_list" => "class/todo_list.class.php",
-        "tva_rate_mtable" => "class/tva_rate_mtable.class.php",
-        "acc_plan_sql" => "database/acc_plan_sql.class.php",
-        "action_gestion_comment_sql" => "database/action_gestion_comment_sql.class.php",
-        "action_gestion_sql" => "database/action_gestion_sql.class.php",
-        "anc_key_sql" => "database/anc_key_sql.class.php",
         "anc_key_ledger_sql" => "database/anc_key_sql.class.php",
         "anc_key_detail_sql" => "database/anc_key_sql.class.php",
         "anc_key_activity_sql" => "database/anc_key_sql.class.php",
-        "attr_def_sql" => "database/attr_def_sql.class.php",
-        "contact_option_ref_sql" => "database/contact_option_ref_sql.class.php",
-        "currency_history_sql" => "database/currency_history_sql.class.php",
-        "currency_sql" => "database/currency_sql.class.php",
-        "default_menu_sql" => "database/default_menu_sql.class.php",
-        "document_state_sql" => "database/document_state_sql.class.php",
-        "document_type_sql" => "database/document_type_sql.class.php",
-        "fiche_def_ref_sql" => "database/fiche_def_ref_sql.class.php",
-        "forecast_category_sql" => "database/forecast_category_sql.class.php",
-        "forecast_item_sql" => "database/forecast_item_sql.class.php",
-        "forecast_sql" => "database/forecast_sql.class.php",
-        "form_definition_sql" => "database/form_definition_sql.class.php",
-        "form_detail_sql" => "database/form_detail_sql.class.php",
-        "jrn_def_sql" => "database/jrn_def_sql.class.php",
-        "jrn_periode_sql" => "database/jrn_periode_sql.class.php",
-        "menu_ref_sql" => "database/menu_ref_sql.class.php",
-        "operation_currency_sql" => "database/operation_currency_sql.class.php",
-        "op_predef_sql" => "database/op_predef_sql.class.php",
-        "parameter_extra_sql" => "database/parameter_extra_sql.class.php",
-        "parm_periode_sql" => "database/parm_periode_sql.class.php",
-        "payment_method_sql" => "database/payment_method_sql.class.php",
-        "poste_analytique_sql" => "database/poste_analytique_sql.class.php",
-        "profile_menu_sql" => "database/profile_menu_sql.class.php",
-        "profile_sql" => "database/profile_sql.class.php",
-        "stock_goods_sql" => "database/stock_goods_sql.class.php",
-        "stock_sql" => "database/stock_sql.class.php",
-        "tag_group_sql" => "database/tag_group_sql.class.php",
-        "tag_sql" => "database/tag_sql.class.php",
-        "tmp_pcmn_sql" => "database/tmp_pcmn_sql.class.php",
-        "tva_rate_sql" => "database/tva_rate_sql.class.php",
-        "user_filter_sql" => "database/user_filter_sql.class.php",
-        "v_currency_last_value_sql" => "database/v_currency_last_value_sql.class.php",
-        "v_tva_rate_sql" => "database/v_tva_rate_sql.class.php",
         "databasecore" => "lib/database_core.class.php",
-        "data_sql" => "lib/data_sql.class.php",
-        "export_data" => "lib/export_data.class.php",
-        "export_data_pdf" => "lib/export_data_pdf.class.php",
-        "filetosend" => "lib/filetosend.class.php",
-        "htmlinput" => "lib/html_input.class.php",
-        "html_tab" => "lib/html_tab.class.php",
-        "html_table" => "lib/html_table.class.php",
         "httpinput" => "lib/http_input.class.php",
-        "iaction" => "lib/iaction.class.php",
-        "ianccard" => "lib/ianccard.class.php",
-        "ibutton" => "lib/ibutton.class.php",
         "ismallbutton" => "lib/ibutton.class.php",
-        "icard" => "lib/icard.class.php",
-        "icheckbox" => "lib/icheckbox.class.php",
-        "icon_action" => "lib/icon_action.class.php",
-        "iconcerned" => "lib/iconcerned.class.php",
-        "idate" => "lib/idate.class.php",
-        "ifile" => "lib/ifile.class.php",
-        "ihidden" => "lib/ihidden.class.php",
-        "impress" => "lib/impress.class.php",
-        "inplace_edit" => "lib/inplace_edit.class.php",
-        "inplace_switch" => "lib/inplace_switch.class.php",
-        "input_checkbox" => "lib/input_checkbox.class.php",
         "inputswitch" => "lib/input_switch.class.php",
-        "inum" => "lib/inum.class.php",
-        "iperiod" => "lib/iperiod.class.php",
-        "ipopup" => "lib/ipopup.class.php",
-        "iposte" => "lib/iposte.class.php",
-        "iradio" => "lib/iradio.class.php",
-        "irelated_action" => "lib/irelated_action.class.php",
-        "iselect" => "lib/iselect.class.php",
-        "ispan" => "lib/ispan.class.php",
-        "itextarea" => "lib/itextarea.class.php",
-        "itext" => "lib/itext.class.php",
-        "itva_popup" => "lib/itva_popup.class.php",
-        "manage_table_sql" => "lib/manage_table_sql.class.php",
-        "noalyss_csv" => "lib/noalyss_csv.class.php",
-        "noalyss_sql" => "lib/noalyss_sql.class.php",
-        "output_html_tab" => "lib/output_html_tab.class.php",
-        "pdf_core" => "lib/pdf_core.class.php",
-        "progress_bar" => "lib/progress_bar.class.php",
-        "select_box" => "lib/select_box.class.php",
-        "select_dialog" => "lib/select_dialog.class.php",
-        "sendmail_core" => "lib/sendmail_core.class.php",
-        "single_record" => "lib/single_record.class.php",
-        "sort_table" => "lib/sort_table.class.php",
-        "table_data_sql" => "lib/table_data_sql.class.php",
-        "zip_extended" => "lib/zip_extended.class.php",
-        "document_state_mtable" => "class/document_state_mtable.class.php",
         "noalyss\mobile" => "class/mobile.class.php",
-        "profile_mobile_sql" => "database/profile_mobile_sql.class.php",
-        "mobile_device_mtable" => "class/mobile_device_mtable.class.php",
-        "html_input_noalyss" => "class/html_input_noalyss.class.php",
-        "card_property" => "class/card_property.class.php",
-        "pdfland" => "class/pdf_land.class.php",
-        "pdf_anc_acc_list" => "class/pdf_anc_acc_list.class.php",
-        'acc_reconciliation_lettering' => 'class/acc_reconciliation_lettering.class.php',
-        "acc_other_tax_mtable" => 'class/acc_other_tax_mtable.class.php',
-        'acc_other_tax_sql' => 'database/acc_other_tax_sql.class.php',
-        'jrn_tax_sql' => 'database/jrn_tax_sql.class.php',
-        'additional_tax' => 'class/additional_tax.class.php',
-        'noalyss_appearance' => 'class/noalyss_appearance.class.php',
-        'icolor'=>'lib/icolor.class.php'
+        "htmlinput" => "lib/html_input.class.php"
     );
     if (isset ($aClass[$class])) {
         require_once NOALYSS_INCLUDE . "/" . $aClass[$class];