diff --git a/src/frontend/app/actions/actions.service.ts b/src/frontend/app/actions/actions.service.ts
index 4dd7b7e2e922dced6d75d6948a46826faf1b5185..42dd7d779eb6206ac59f55289e2815180a6e89c6 100644
--- a/src/frontend/app/actions/actions.service.ts
+++ b/src/frontend/app/actions/actions.service.ts
@@ -41,9 +41,9 @@ import { SaveAndPrintRegisteredMailActionComponent } from './save-and-print-regi
 import { SaveAndIndexRegisteredMailActionComponent } from './save-and-index-registered-mail-action/save-and-index-registered-mail-action.component';
 import { PrintRegisteredMailActionComponent } from './print-registered-mail-action/print-registered-mail-action.component';
 import { PrintDepositListActionComponent } from './print-deposit-list-action/print-deposit-list-action.component';
-import { SendToRecordManagementComponent } from './send-to-record-management/send-to-record-management.component';
-import { CheckReplyRecordManagementComponent } from './check-reply-record-management/check-reply-record-management.component';
-import { CheckAcknowledgmentRecordManagementComponent } from './check-acknowledgment-record-management/check-acknowledgment-record-management.component';
+import { SendToRecordManagementComponent } from './send-to-record-management-action/send-to-record-management.component';
+import { CheckReplyRecordManagementComponent } from './check-reply-record-management-action/check-reply-record-management.component';
+import { CheckAcknowledgmentRecordManagementComponent } from './check-acknowledgment-record-management-action/check-acknowledgment-record-management.component';
 
 @Injectable()
 export class ActionsService implements OnDestroy {
diff --git a/src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.html b/src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.html
similarity index 100%
rename from src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.html
rename to src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.html
diff --git a/src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.scss b/src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.scss
similarity index 100%
rename from src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.scss
rename to src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.scss
diff --git a/src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.ts b/src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.ts
similarity index 100%
rename from src/frontend/app/actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component.ts
rename to src/frontend/app/actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component.ts
diff --git a/src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.html b/src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.html
similarity index 100%
rename from src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.html
rename to src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.html
diff --git a/src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.scss b/src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.scss
similarity index 100%
rename from src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.scss
rename to src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.scss
diff --git a/src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.ts b/src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.ts
similarity index 100%
rename from src/frontend/app/actions/check-reply-record-management/check-reply-record-management.component.ts
rename to src/frontend/app/actions/check-reply-record-management-action/check-reply-record-management.component.ts
diff --git a/src/frontend/app/actions/reconciliation-action/reconcile-action.component.ts b/src/frontend/app/actions/reconciliation-action/reconcile-action.component.ts
index 2e778e197176b360168ec7936249b5fb0771be12..b7133aa6af6af8755cc853edcbe6792ea8541bc7 100644
--- a/src/frontend/app/actions/reconciliation-action/reconcile-action.component.ts
+++ b/src/frontend/app/actions/reconciliation-action/reconcile-action.component.ts
@@ -7,7 +7,7 @@ import { NoteEditorComponent } from '../../notes/note-editor.component';
 import { tap, finalize, catchError } from 'rxjs/operators';
 import { of } from 'rxjs';
 import { FunctionsService } from '@service/functions.service';
-import { SearchResultListComponent } from '@appRoot/adv-search/result-list/search-result-list.component';
+import { SearchResultListComponent } from '@appRoot/search/result-list/search-result-list.component';
 
 @Component({
     templateUrl: 'reconcile-action.component.html',
diff --git a/src/frontend/app/actions/send-to-record-management/send-to-record-management.component.html b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html
similarity index 100%
rename from src/frontend/app/actions/send-to-record-management/send-to-record-management.component.html
rename to src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.html
diff --git a/src/frontend/app/actions/send-to-record-management/send-to-record-management.component.scss b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.scss
similarity index 100%
rename from src/frontend/app/actions/send-to-record-management/send-to-record-management.component.scss
rename to src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.scss
diff --git a/src/frontend/app/actions/send-to-record-management/send-to-record-management.component.ts b/src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts
similarity index 100%
rename from src/frontend/app/actions/send-to-record-management/send-to-record-management.component.ts
rename to src/frontend/app/actions/send-to-record-management-action/send-to-record-management.component.ts
diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts
index d51381facb5ac3b95765bb32c73390abd655a279..284aef9945b0f4a4878ed81660d13032a0e85780 100755
--- a/src/frontend/app/app-common.module.ts
+++ b/src/frontend/app/app-common.module.ts
@@ -28,10 +28,6 @@ import { HeaderPanelComponent } from './header/header-panel.component';
 import { MenuNavComponent } from './menu/menu-nav.component';
 import { MenuShortcutComponent, IndexingGroupModalComponent } from './menu/menu-shortcut.component';
 
-/*SEARCH*/
-import { SearchHomeComponent } from './search/search-home.component';
-
-/*SEARCH*/
 import { BasketHomeComponent } from './basket/basket-home.component';
 
 import { FieldListComponent } from './indexation/field-list/field-list.component';
@@ -80,7 +76,7 @@ import { InternationalizationModule } from '@service/translate/internationalizat
 import { TranslateService } from '@ngx-translate/core';
 
 import { RegisteredMailImportComponent } from '@appRoot/registeredMail/import/registered-mail-import.component';
-import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteria-tool.component';
+import { CriteriaToolComponent } from '@appRoot/search/criteria-tool/criteria-tool.component';
 
 
 @NgModule({
@@ -101,7 +97,6 @@ import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteri
         HeaderRightComponent,
         HeaderLeftComponent,
         HeaderPanelComponent,
-        SearchHomeComponent,
         BasketHomeComponent,
         IndexingGroupModalComponent,
         RegisteredMailImportComponent,
@@ -148,7 +143,6 @@ import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteri
         HeaderRightComponent,
         HeaderLeftComponent,
         HeaderPanelComponent,
-        SearchHomeComponent,
         BasketHomeComponent,
         FormsModule,
         ReactiveFormsModule,
diff --git a/src/frontend/app/app-routing.module.ts b/src/frontend/app/app-routing.module.ts
index 3f110638159b23eaf1b17267762461279dbda81c..1ec529e1c917e75c15d004e9201c8f1ef96a710e 100755
--- a/src/frontend/app/app-routing.module.ts
+++ b/src/frontend/app/app-routing.module.ts
@@ -18,7 +18,7 @@ import { FollowedDocumentListComponent } from './home/followed-list/followed-doc
 import { FolderDocumentListComponent } from './folder/document-list/folder-document-list.component';
 import { BasketListComponent } from './list/basket-list.component';
 import { AcknowledgementReceptionComponent } from './registeredMail/acknowledgement-reception/acknowledgement-reception.component';
-import { AdvSearchComponent } from './adv-search/adv-search.component';
+import { SearchComponent } from './search/search.component';
 import { ProcessComponent } from './process/process.component';
 import { IndexationComponent } from './indexation/indexation.component';
 
@@ -44,7 +44,7 @@ const routes: Routes = [
     { path: 'basketList/users/:userSerialId/groups/:groupSerialId/baskets/:basketId', canActivate: [AppGuard], component: BasketListComponent },
     { path: 'login', component: LoginComponent },
     { path: 'registeredMail/acknowledgement', canActivate: [AppGuard], component: AcknowledgementReceptionComponent },
-    { path: 'search', canActivate: [AppGuard], component: AdvSearchComponent },
+    { path: 'search', canActivate: [AppGuard], component: SearchComponent },
     {
         path: 'process/users/:userSerialId/groups/:groupSerialId/baskets/:basketId/resId/:resId',
         canActivate: [AppGuard],
diff --git a/src/frontend/app/app.module.ts b/src/frontend/app/app.module.ts
index f8406efc31891e5a8e5d2964bcff5c66ce793675..c2526167a82d1a2171ac5490c850b89a6a42a3dd 100755
--- a/src/frontend/app/app.module.ts
+++ b/src/frontend/app/app.module.ts
@@ -64,9 +64,9 @@ import { SaveAndIndexRegisteredMailActionComponent } from './actions/save-and-in
 import { SaveAndPrintRegisteredMailActionComponent } from './actions/save-and-print-registered-mail-action/save-and-print-registered-mail-action.component';
 import { PrintRegisteredMailActionComponent } from './actions/print-registered-mail-action/print-registered-mail-action.component';
 import { PrintDepositListActionComponent } from './actions/print-deposit-list-action/print-deposit-list-action.component';
-import { SendToRecordManagementComponent } from './actions/send-to-record-management/send-to-record-management.component';
-import { CheckReplyRecordManagementComponent } from './actions/check-reply-record-management/check-reply-record-management.component';
-import { CheckAcknowledgmentRecordManagementComponent } from './actions/check-acknowledgment-record-management/check-acknowledgment-record-management.component';
+import { SendToRecordManagementComponent } from './actions/send-to-record-management-action/send-to-record-management.component';
+import { CheckReplyRecordManagementComponent } from './actions/check-reply-record-management-action/check-reply-record-management.component';
+import { CheckAcknowledgmentRecordManagementComponent } from './actions/check-acknowledgment-record-management-action/check-acknowledgment-record-management.component';
 
 
 // PROCESS
@@ -82,15 +82,15 @@ import { SentResourcePageComponent } from './sentResource/sent-resource-page/sen
 import { SentNumericPackagePageComponent } from './sentResource/sent-numeric-package-page/sent-numeric-package-page.component';
 import { ThesaurusModalComponent } from './tag/indexing/thesaurus/thesaurus-modal.component';
 import { SelectIndexingModelComponent } from './indexation/select-indexing-model/select-indexing-model.component';
-import { FilterToolComponent } from './adv-search/filter-tool/filter-tool.component';
+import { FilterToolComponent } from './search/filter-tool/filter-tool.component';
 
-import { AdvSearchComponent } from './adv-search/adv-search.component';
-import { SearchResultListComponent } from './adv-search/result-list/search-result-list.component';
+import { SearchComponent } from './search/search.component';
+import { SearchResultListComponent } from './search/result-list/search-result-list.component';
 import { AboutUsComponent } from './about-us.component';
 import { ActivateUserComponent } from './activate-user.component';
 import { AddAvisModelModalComponent } from './avis/addAvisModel/add-avis-model-modal.component';
 import { AddPrivateIndexingModelModalComponent } from './indexation/private-indexing-model/add-private-indexing-model-modal.component';
-import { AddSearchTemplateModalComponent } from './adv-search/criteria-tool/search-template/search-template-modal.component';
+import { AddSearchTemplateModalComponent } from './search/criteria-tool/search-template/search-template-modal.component';
 import { AddVisaModelModalComponent } from './visa/addVisaModel/add-visa-model-modal.component';
 import { AttachmentCreateComponent } from './attachments/attachment-create/attachment-create.component';
 import { AttachmentPageComponent } from './attachments/attachments-page/attachment-page.component';
@@ -160,7 +160,7 @@ export class MyHammerConfig extends HammerGestureConfig {
         SelectIndexingModelComponent,
         FilterToolComponent,
         PanelListComponent,
-        AdvSearchComponent,
+        SearchComponent,
         SearchResultListComponent,
         AboutUsComponent,
         ActivateUserComponent,
diff --git a/src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.ts b/src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.ts
index fbc26cf6c814e98ee72693853730d414e94aa6de..99854dd177166697d25a8ad07c12625ef3ec3265 100644
--- a/src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.ts
+++ b/src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.ts
@@ -5,7 +5,7 @@ import { HttpClient } from '@angular/common/http';
 import { NotificationService } from '@service/notification/notification.service';
 import { of } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
-import { SearchResultListComponent } from '@appRoot/adv-search/result-list/search-result-list.component';
+import { SearchResultListComponent } from '@appRoot/search/result-list/search-result-list.component';
 
 @Component({
     templateUrl: 'link-resource-modal.component.html',
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html b/src/frontend/app/search/criteria-tool/criteria-tool.component.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/criteria-tool.component.html
rename to src/frontend/app/search/criteria-tool/criteria-tool.component.html
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss b/src/frontend/app/search/criteria-tool/criteria-tool.component.scss
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/criteria-tool.component.scss
rename to src/frontend/app/search/criteria-tool/criteria-tool.component.scss
diff --git a/src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts b/src/frontend/app/search/criteria-tool/criteria-tool.component.ts
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/criteria-tool.component.ts
rename to src/frontend/app/search/criteria-tool/criteria-tool.component.ts
diff --git a/src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.html b/src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.html
rename to src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.html
diff --git a/src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.scss b/src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.scss
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.scss
rename to src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.scss
diff --git a/src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.ts b/src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.ts
similarity index 100%
rename from src/frontend/app/adv-search/criteria-tool/search-template/search-template-modal.component.ts
rename to src/frontend/app/search/criteria-tool/search-template/search-template-modal.component.ts
diff --git a/src/frontend/app/adv-search/filter-tool/filter-tool.component.html b/src/frontend/app/search/filter-tool/filter-tool.component.html
similarity index 100%
rename from src/frontend/app/adv-search/filter-tool/filter-tool.component.html
rename to src/frontend/app/search/filter-tool/filter-tool.component.html
diff --git a/src/frontend/app/adv-search/filter-tool/filter-tool.component.scss b/src/frontend/app/search/filter-tool/filter-tool.component.scss
similarity index 100%
rename from src/frontend/app/adv-search/filter-tool/filter-tool.component.scss
rename to src/frontend/app/search/filter-tool/filter-tool.component.scss
diff --git a/src/frontend/app/adv-search/filter-tool/filter-tool.component.ts b/src/frontend/app/search/filter-tool/filter-tool.component.ts
similarity index 100%
rename from src/frontend/app/adv-search/filter-tool/filter-tool.component.ts
rename to src/frontend/app/search/filter-tool/filter-tool.component.ts
diff --git a/src/frontend/app/adv-search/result-list/search-result-list.component.html b/src/frontend/app/search/result-list/search-result-list.component.html
similarity index 100%
rename from src/frontend/app/adv-search/result-list/search-result-list.component.html
rename to src/frontend/app/search/result-list/search-result-list.component.html
diff --git a/src/frontend/app/adv-search/result-list/search-result-list.component.scss b/src/frontend/app/search/result-list/search-result-list.component.scss
similarity index 100%
rename from src/frontend/app/adv-search/result-list/search-result-list.component.scss
rename to src/frontend/app/search/result-list/search-result-list.component.scss
diff --git a/src/frontend/app/adv-search/result-list/search-result-list.component.ts b/src/frontend/app/search/result-list/search-result-list.component.ts
similarity index 99%
rename from src/frontend/app/adv-search/result-list/search-result-list.component.ts
rename to src/frontend/app/search/result-list/search-result-list.component.ts
index 276b3049c7cc5a663cabb5b1689bb30d60f6fcd1..c1e24c160dfe2f17658555f6c161acc306e83003 100644
--- a/src/frontend/app/adv-search/result-list/search-result-list.component.ts
+++ b/src/frontend/app/search/result-list/search-result-list.component.ts
@@ -18,11 +18,11 @@ import { FolderActionListComponent } from '@appRoot/folder/folder-action-list/fo
 import { FoldersService } from '@appRoot/folder/folders.service';
 import { FunctionsService } from '@service/functions.service';
 import { of, merge, Subject, Subscription, Observable } from 'rxjs';
-import { CriteriaToolComponent } from '@appRoot/adv-search/criteria-tool/criteria-tool.component';
+import { CriteriaToolComponent } from '@appRoot/search/criteria-tool/criteria-tool.component';
 import { IndexingFieldsService } from '@service/indexing-fields.service';
 import { CriteriaSearchService } from '@service/criteriaSearch.service';
 import { HighlightPipe } from '@plugins/highlight.pipe';
-import { FilterToolComponent } from '@appRoot/adv-search/filter-tool/filter-tool.component';
+import { FilterToolComponent } from '@appRoot/search/filter-tool/filter-tool.component';
 import { ContactResourceModalComponent } from '@appRoot/contact/contact-resource/modal/contact-resource-modal.component';
 
 declare var $: any;
diff --git a/src/frontend/app/search/search-home.component.html b/src/frontend/app/search/search-home.component.html
deleted file mode 100755
index 8943198933290a31c9082d475626104dcf8518e2..0000000000000000000000000000000000000000
--- a/src/frontend/app/search/search-home.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<form style="margin-bottom: 0px;" ngNoForm name="choose_query" id="choose_query" method="post" action="index.php?display=true&amp;dir=indexing_searching&amp;page=search_adv_result">
-    <input type="hidden" name="meta[]" value="baskets_clause#baskets_clause#select_simple">
-    <input type="hidden" name="meta[]" value="welcome#welcome#welcome">
-    <input type="hidden" name="baskets_clause" value="true">
-    <mat-form-field id="searchInput" floatLabel="never" style="width:100%">
-        <input matInput type="text" name="welcome" placeholder="{{'lang.searchMails' | translate}}" style="width:100%">
-        <button title="{{'lang.quickSearchInfo' | translate}} : {{'lang.quickSearchTarget' | translate}}" mat-button matSuffix mat-icon-button type="submit" aria-label="Clear" style="opacity:0.5;">
-          <mat-icon class="fa fa-search"></mat-icon>
-        </button>
-    </mat-form-field>
-    <input #searchHome type="submit" name="submit" value="" style="display:none">
-</form>
diff --git a/src/frontend/app/search/search-home.component.ts b/src/frontend/app/search/search-home.component.ts
deleted file mode 100755
index bab9b6b7cb8a4effae039be535ff66ef36bb23cd..0000000000000000000000000000000000000000
--- a/src/frontend/app/search/search-home.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-
-@Component({
-    selector: 'search-home',
-    templateUrl: 'search-home.component.html',
-})
-export class SearchHomeComponent implements OnInit {
-
-    
-
-    constructor(public translate: TranslateService) {
-    }
-
-    ngOnInit(): void { }
-
-}
diff --git a/src/frontend/app/adv-search/adv-search.component.html b/src/frontend/app/search/search.component.html
similarity index 100%
rename from src/frontend/app/adv-search/adv-search.component.html
rename to src/frontend/app/search/search.component.html
diff --git a/src/frontend/app/adv-search/adv-search.component.scss b/src/frontend/app/search/search.component.scss
similarity index 100%
rename from src/frontend/app/adv-search/adv-search.component.scss
rename to src/frontend/app/search/search.component.scss
diff --git a/src/frontend/app/adv-search/adv-search.component.ts b/src/frontend/app/search/search.component.ts
similarity index 93%
rename from src/frontend/app/adv-search/adv-search.component.ts
rename to src/frontend/app/search/search.component.ts
index 2a5fc16f9cbaac610261aefa807229ab1801f4cd..c2238f9226ab756044f4ce0244892c4b62a3e10e 100644
--- a/src/frontend/app/adv-search/adv-search.component.ts
+++ b/src/frontend/app/search/search.component.ts
@@ -11,10 +11,10 @@ import { SearchResultListComponent } from './result-list/search-result-list.comp
 
 
 @Component({
-    templateUrl: 'adv-search.component.html',
-    styleUrls: ['adv-search.component.scss']
+    templateUrl: 'search.component.html',
+    styleUrls: ['search.component.scss']
 })
-export class AdvSearchComponent implements OnInit {
+export class SearchComponent implements OnInit {
 
     searchTerm: string = '';