113 files changed, 93 insertions, 56 deletions

diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
index 9aa70288d..5db2887fa 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts
@@ -3,6 +3,7 @@ import { Actor } from '@app/shared/shared-main'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoAbusePredefinedReasonsString } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model'
 import { ProcessedVideoAbuse } from './video-abuse-list.component'
+import { durationToString } from '@app/helpers'
 
 @Component({
   selector: 'my-video-abuse-details',
diff --git a/client/src/app/login/login-routing.module.ts b/client/src/app/+login/login-routing.module.ts
index 22f59b4d9..aad55eac8 100644
--- a/client/src/app/login/login-routing.module.ts
+++ b/client/src/app/+login/login-routing.module.ts
@@ -6,7 +6,7 @@ import { ServerConfigResolver } from '@app/core/routing/server-config-resolver.s
 
 const loginRoutes: Routes = [
   {
-    path: 'login',
+    path: '',
     component: LoginComponent,
     canActivate: [ MetaGuard ],
     data: {
diff --git a/client/src/app/login/login.component.html b/client/src/app/+login/login.component.html
index 599b203ae..599b203ae 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/+login/login.component.html
diff --git a/client/src/app/login/login.component.scss b/client/src/app/+login/login.component.scss
index fde6cc15e..fde6cc15e 100644
--- a/client/src/app/login/login.component.scss
+++ b/client/src/app/+login/login.component.scss
diff --git a/client/src/app/login/login.component.ts b/client/src/app/+login/login.component.ts
index cbc51ee21..cbc51ee21 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/+login/login.component.ts
diff --git a/client/src/app/login/login.module.ts b/client/src/app/+login/login.module.ts
index c41902426..c41902426 100644
--- a/client/src/app/login/login.module.ts
+++ b/client/src/app/+login/login.module.ts
diff --git a/client/src/app/reset-password/reset-password-routing.module.ts b/client/src/app/+reset-password/reset-password-routing.module.ts
index d443b51d6..31bc08709 100644
--- a/client/src/app/reset-password/reset-password-routing.module.ts
+++ b/client/src/app/+reset-password/reset-password-routing.module.ts
@@ -5,7 +5,7 @@ import { ResetPasswordComponent } from './reset-password.component'
 
 const resetPasswordRoutes: Routes = [
   {
-    path: 'reset-password',
+    path: '',
     component: ResetPasswordComponent,
     canActivate: [ MetaGuard ],
     data: {
diff --git a/client/src/app/reset-password/reset-password.component.html b/client/src/app/+reset-password/reset-password.component.html
index af30af4a0..af30af4a0 100644
--- a/client/src/app/reset-password/reset-password.component.html
+++ b/client/src/app/+reset-password/reset-password.component.html
diff --git a/client/src/app/reset-password/reset-password.component.scss b/client/src/app/+reset-password/reset-password.component.scss
index efec6b706..efec6b706 100644
--- a/client/src/app/reset-password/reset-password.component.scss
+++ b/client/src/app/+reset-password/reset-password.component.scss
diff --git a/client/src/app/reset-password/reset-password.component.ts b/client/src/app/+reset-password/reset-password.component.ts
index 8d50e9839..8d50e9839 100644
--- a/client/src/app/reset-password/reset-password.component.ts
+++ b/client/src/app/+reset-password/reset-password.component.ts
diff --git a/client/src/app/reset-password/reset-password.module.ts b/client/src/app/+reset-password/reset-password.module.ts
index c77f1c4b0..c77f1c4b0 100644
--- a/client/src/app/reset-password/reset-password.module.ts
+++ b/client/src/app/+reset-password/reset-password.module.ts
diff --git a/client/src/app/search/channel-lazy-load.resolver.ts b/client/src/app/+search/channel-lazy-load.resolver.ts
index 5b6961e98..17a212829 100644
--- a/client/src/app/search/channel-lazy-load.resolver.ts
+++ b/client/src/app/+search/channel-lazy-load.resolver.ts
@@ -1,7 +1,7 @@
 import { map } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'
-import { SearchService } from './search.service'
+import { SearchService } from '@app/shared/shared-search'
 
 @Injectable()
 export class ChannelLazyLoadResolver implements Resolve<any> {
diff --git a/client/src/app/search/search-filters.component.html b/client/src/app/+search/search-filters.component.html
index e20aef8fb..e20aef8fb 100644
--- a/client/src/app/search/search-filters.component.html
+++ b/client/src/app/+search/search-filters.component.html
diff --git a/client/src/app/search/search-filters.component.scss b/client/src/app/+search/search-filters.component.scss
index a88a1c0b0..a88a1c0b0 100644
--- a/client/src/app/search/search-filters.component.scss
+++ b/client/src/app/+search/search-filters.component.scss
diff --git a/client/src/app/search/search-filters.component.ts b/client/src/app/+search/search-filters.component.ts
index 14a5d0484..fc1db3258 100644
--- a/client/src/app/search/search-filters.component.ts
+++ b/client/src/app/+search/search-filters.component.ts
@@ -1,8 +1,8 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { ValidatorFn } from '@angular/forms'
 import { ServerService } from '@app/core'
-import { AdvancedSearch } from '@app/search/advanced-search.model'
 import { VideoValidatorsService } from '@app/shared/shared-forms'
+import { AdvancedSearch } from '@app/shared/shared-search'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ServerConfig, VideoConstant } from '@shared/models'
 
diff --git a/client/src/app/search/search-routing.module.ts b/client/src/app/+search/search-routing.module.ts
index 9da900e9a..14a0d0a13 100644
--- a/client/src/app/search/search-routing.module.ts
+++ b/client/src/app/+search/search-routing.module.ts
@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { SearchComponent } from '@app/search/search.component'
 import { MetaGuard } from '@ngx-meta/core'
-import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
 import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver'
+import { SearchComponent } from './search.component'
+import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
 
 const searchRoutes: Routes = [
   {
-    path: 'search',
+    path: '',
     component: SearchComponent,
     canActivate: [ MetaGuard ],
     data: {
@@ -17,7 +17,7 @@ const searchRoutes: Routes = [
     }
   },
   {
-    path: 'search/lazy-load-video',
+    path: 'lazy-load-video',
     component: SearchComponent,
     canActivate: [ MetaGuard ],
     resolve: {
@@ -25,7 +25,7 @@ const searchRoutes: Routes = [
     }
   },
   {
-    path: 'search/lazy-load-channel',
+    path: 'lazy-load-channel',
     component: SearchComponent,
     canActivate: [ MetaGuard ],
     resolve: {
diff --git a/client/src/app/search/search.component.html b/client/src/app/+search/search.component.html
index 9bff024ad..9bff024ad 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/+search/search.component.html
diff --git a/client/src/app/search/search.component.scss b/client/src/app/+search/search.component.scss
index 6e59adb60..6e59adb60 100644
--- a/client/src/app/search/search.component.scss
+++ b/client/src/app/+search/search.component.scss
diff --git a/client/src/app/search/search.component.ts b/client/src/app/+search/search.component.ts
index 83b06e0ce..1ed54937b 100644
--- a/client/src/app/search/search.component.ts
+++ b/client/src/app/+search/search.component.ts
@@ -4,12 +4,11 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, ComponentPagination, HooksService, Notifier, ServerService, User, UserService } from '@app/core'
 import { immutableAssign } from '@app/helpers'
 import { Video, VideoChannel } from '@app/shared/shared-main'
+import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
 import { MiniatureDisplayOptions } from '@app/shared/shared-video-miniature'
 import { MetaService } from '@ngx-meta/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { SearchTargetType, ServerConfig } from '@shared/models'
-import { AdvancedSearch } from './advanced-search.model'
-import { SearchService } from './search.service'
 
 @Component({
   selector: 'my-search',
diff --git a/client/src/app/search/search.module.ts b/client/src/app/+search/search.module.ts
index 65c954de8..ee4f07ad1 100644
--- a/client/src/app/search/search.module.ts
+++ b/client/src/app/+search/search.module.ts
@@ -2,14 +2,14 @@ import { TagInputModule } from 'ngx-chips'
 import { NgModule } from '@angular/core'
 import { SharedFormModule } from '@app/shared/shared-forms'
 import { SharedMainModule } from '@app/shared/shared-main'
+import { SharedSearchModule } from '@app/shared/shared-search'
 import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
 import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
+import { SearchService } from '../shared/shared-search/search.service'
 import { ChannelLazyLoadResolver } from './channel-lazy-load.resolver'
-import { HighlightPipe } from './highlight.pipe'
 import { SearchFiltersComponent } from './search-filters.component'
 import { SearchRoutingModule } from './search-routing.module'
 import { SearchComponent } from './search.component'
-import { SearchService } from './search.service'
 import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
 
 @NgModule({
@@ -17,7 +17,9 @@ import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
     TagInputModule,
 
     SearchRoutingModule,
+
     SharedMainModule,
+    SharedSearchModule,
     SharedFormModule,
     SharedUserSubscriptionModule,
     SharedVideoMiniatureModule
@@ -36,8 +38,7 @@ import { VideoLazyLoadResolver } from './video-lazy-load.resolver'
   providers: [
     SearchService,
     VideoLazyLoadResolver,
-    ChannelLazyLoadResolver,
-    HighlightPipe
+    ChannelLazyLoadResolver
   ]
 })
 export class SearchModule { }
diff --git a/client/src/app/search/video-lazy-load.resolver.ts b/client/src/app/+search/video-lazy-load.resolver.ts
index 8d846d367..e8b2b8c74 100644
--- a/client/src/app/search/video-lazy-load.resolver.ts
+++ b/client/src/app/+search/video-lazy-load.resolver.ts
@@ -1,7 +1,7 @@
 import { map } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'
-import { SearchService } from './search.service'
+import { SearchService } from '@app/shared/shared-search'
 
 @Injectable()
 export class VideoLazyLoadResolver implements Resolve<any> {
diff --git a/client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts b/client/src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts
index b05852ff8..b05852ff8 100644
--- a/client/src/app/videos/+video-edit/shared/i18n-primeng-calendar.service.ts
+++ b/client/src/app/+videos/+video-edit/shared/i18n-primeng-calendar.service.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html
index 6a9e31b5a..6a9e31b5a 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.html
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.scss b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.scss
index b257a16a9..b257a16a9 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.scss
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
index a90d04ce8..a90d04ce8 100644
--- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-caption-add-modal.component.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
index c11a60dce..c11a60dce 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
index 69b907288..69b907288 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.scss
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
index 239e453ad..239e453ad 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.module.ts b/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
index 96061a300..96061a300 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.module.ts
+++ b/client/src/app/+videos/+video-edit/shared/video-edit.module.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/drag-drop.directive.ts b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
index 7b1a38c62..7b1a38c62 100644
--- a/client/src/app/videos/+video-edit/video-add-components/drag-drop.directive.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/drag-drop.directive.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
index 7287f799d..7287f799d 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
index 1fef74994..1fef74994 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
index 5b453a1d9..538a187a8 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
@@ -4,7 +4,7 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@a
 import { scrollToTop } from '@app/helpers'
 import { FormValidatorService } from '@app/shared/shared-forms'
 import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main'
-import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
+import { VideoSend } from './video-send'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoPrivacy, VideoUpdate } from '@shared/models'
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
index 1910da403..1910da403 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
index d0bd1f54d..6508eef7e 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
@@ -5,7 +5,7 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService } from '@a
 import { getAbsoluteAPIUrl, scrollToTop } from '@app/helpers'
 import { FormValidatorService } from '@app/shared/shared-forms'
 import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main'
-import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
+import { VideoSend } from './video-send'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoPrivacy, VideoUpdate } from '@shared/models'
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.scss b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
index ebe14c59e..ebe14c59e 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.ts b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
index 94479321d..94479321d 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-send.ts
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
index dad88a661..dad88a661 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.html
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
index a4f87b0b8..a4f87b0b8 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index eb7ac32ae..e46ce6599 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -7,10 +7,10 @@ import { AuthService, CanComponentDeactivate, Notifier, ServerService, UserServi
 import { scrollToTop } from '@app/helpers'
 import { FormValidatorService } from '@app/shared/shared-forms'
 import { VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
-import { VideoSend } from '@app/videos/+video-edit/video-add-components/video-send'
 import { LoadingBarService } from '@ngx-loading-bar/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { VideoPrivacy } from '@shared/models'
+import { VideoSend } from './video-send'
 
 @Component({
   selector: 'my-video-upload',
diff --git a/client/src/app/videos/+video-edit/video-add-routing.module.ts b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
index 9ff66bea0..9ff66bea0 100644
--- a/client/src/app/videos/+video-edit/video-add-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add-routing.module.ts
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/+videos/+video-edit/video-add.component.html
index 79bfc6e5c..79bfc6e5c 100644
--- a/client/src/app/videos/+video-edit/video-add.component.html
+++ b/client/src/app/+videos/+video-edit/video-add.component.html
diff --git a/client/src/app/videos/+video-edit/video-add.component.scss b/client/src/app/+videos/+video-edit/video-add.component.scss
index 0ad57d897..0ad57d897 100644
--- a/client/src/app/videos/+video-edit/video-add.component.scss
+++ b/client/src/app/+videos/+video-edit/video-add.component.scss
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/+videos/+video-edit/video-add.component.ts
index 5bd768809..5bd768809 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add.component.ts
diff --git a/client/src/app/videos/+video-edit/video-add.module.ts b/client/src/app/+videos/+video-edit/video-add.module.ts
index 477c1cf5e..477c1cf5e 100644
--- a/client/src/app/videos/+video-edit/video-add.module.ts
+++ b/client/src/app/+videos/+video-edit/video-add.module.ts
diff --git a/client/src/app/videos/+video-edit/video-update-routing.module.ts b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
index a04351b05..a04351b05 100644
--- a/client/src/app/videos/+video-edit/video-update-routing.module.ts
+++ b/client/src/app/+videos/+video-edit/video-update-routing.module.ts
diff --git a/client/src/app/videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html
index fbc642db9..fbc642db9 100644
--- a/client/src/app/videos/+video-edit/video-update.component.html
+++ b/client/src/app/+videos/+video-edit/video-update.component.html
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts
index 7bd6eb553..7bd6eb553 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/+videos/+video-edit/video-update.component.ts
diff --git a/client/src/app/videos/+video-edit/video-update.module.ts b/client/src/app/+videos/+video-edit/video-update.module.ts
index 322c69629..99cd8bea1 100644
--- a/client/src/app/videos/+video-edit/video-update.module.ts
+++ b/client/src/app/+videos/+video-edit/video-update.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core'
 import { CanDeactivateGuard } from '@app/core'
-import { VideoUpdateResolver } from '@app/videos/+video-edit/video-update.resolver'
 import { VideoEditModule } from './shared/video-edit.module'
 import { VideoUpdateRoutingModule } from './video-update-routing.module'
 import { VideoUpdateComponent } from './video-update.component'
+import { VideoUpdateResolver } from './video-update.resolver'
 
 @NgModule({
   imports: [
diff --git a/client/src/app/videos/+video-edit/video-update.resolver.ts b/client/src/app/+videos/+video-edit/video-update.resolver.ts
index 30bcf4d74..30bcf4d74 100644
--- a/client/src/app/videos/+video-edit/video-update.resolver.ts
+++ b/client/src/app/+videos/+video-edit/video-update.resolver.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
index 9b43d91da..9b43d91da 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss
index b3725ab94..b3725ab94 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts
index 79505c779..79505c779 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-thread-tree.model.ts b/client/src/app/+videos/+video-watch/comment/video-comment-thread-tree.model.ts
index 7c2aaeadd..7c2aaeadd 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-thread-tree.model.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-thread-tree.model.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index 002de57e4..002de57e4 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
index e7ef79561..e7ef79561 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
index 27846c1ad..27846c1ad 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.model.ts b/client/src/app/+videos/+video-watch/comment/video-comment.model.ts
index e85443196..e85443196 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.model.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.model.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/+videos/+video-watch/comment/video-comment.service.ts
index a73fb9ca8..a73fb9ca8 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.service.ts
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/comment/video-comments.component.html
index dd1d43560..dd1d43560 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.html
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
index df42fae73..df42fae73 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
index df0018ec6..df0018ec6 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.html b/client/src/app/+videos/+video-watch/modal/video-share.component.html
index 5e6a2d518..5e6a2d518 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.html
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.html
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.scss b/client/src/app/+videos/+video-watch/modal/video-share.component.scss
index 091d4dc3b..091d4dc3b 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.scss
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.scss
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/+videos/+video-watch/modal/video-share.component.ts
index b42b775c1..b42b775c1 100644
--- a/client/src/app/videos/+video-watch/modal/video-share.component.ts
+++ b/client/src/app/+videos/+video-watch/modal/video-share.component.ts
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/+videos/+video-watch/modal/video-support.component.html
index 935656d23..935656d23 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.html
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.html
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.scss b/client/src/app/+videos/+video-watch/modal/video-support.component.scss
index 184e09027..184e09027 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.scss
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.scss
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/+videos/+video-watch/modal/video-support.component.ts
index 48d5f2948..48d5f2948 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.ts
+++ b/client/src/app/+videos/+video-watch/modal/video-support.component.ts
diff --git a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts b/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts
index a376453bf..29fa268f4 100644
--- a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts
@@ -2,9 +2,8 @@ import { Observable, of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ServerService, UserService } from '@app/core'
-import { AdvancedSearch } from '@app/search/advanced-search.model'
-import { SearchService } from '@app/search/search.service'
 import { Video, VideoService } from '@app/shared/shared-main'
+import { AdvancedSearch, SearchService } from '@app/shared/shared-search'
 import { ServerConfig } from '@shared/models'
 import { RecommendationInfo } from './recommendation-info.model'
 import { RecommendationService } from './recommendations.service'
diff --git a/client/src/app/videos/recommendations/recommendation-info.model.ts b/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts
index 0233563bb..0233563bb 100644
--- a/client/src/app/videos/recommendations/recommendation-info.model.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts
diff --git a/client/src/app/videos/recommendations/recommendations.module.ts b/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts
index 03cc272ca..259afb196 100644
--- a/client/src/app/videos/recommendations/recommendations.module.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts
@@ -2,6 +2,7 @@ import { InputSwitchModule } from 'primeng/inputswitch'
 import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { SharedMainModule } from '@app/shared/shared-main'
+import { SharedSearchModule } from '@app/shared/shared-search'
 import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
 import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
 import { RecentVideosRecommendationService } from './recent-videos-recommendation.service'
@@ -14,6 +15,7 @@ import { RecommendedVideosStore } from './recommended-videos.store'
     InputSwitchModule,
 
     SharedMainModule,
+    SharedSearchModule,
     SharedVideoPlaylistModule,
     SharedVideoMiniatureModule
   ],
diff --git a/client/src/app/videos/recommendations/recommendations.service.ts b/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts
index 1d79d35f6..1d79d35f6 100644
--- a/client/src/app/videos/recommendations/recommendations.service.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html
index 0467cabf5..0467cabf5 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.html
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.scss b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss
index b278c9654..b278c9654 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.scss
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.ts b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts
index 016975341..016975341 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts
diff --git a/client/src/app/videos/recommendations/recommended-videos.store.ts b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts
index 8c3fb6480..8c3fb6480 100644
--- a/client/src/app/videos/recommendations/recommended-videos.store.ts
+++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts
diff --git a/client/src/app/videos/+video-watch/timestamp-route-transformer.directive.ts b/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts
index 45e023695..45e023695 100644
--- a/client/src/app/videos/+video-watch/timestamp-route-transformer.directive.ts
+++ b/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts
diff --git a/client/src/app/videos/+video-watch/video-duration-formatter.pipe.ts b/client/src/app/+videos/+video-watch/video-duration-formatter.pipe.ts
index 4b6767415..4b6767415 100644
--- a/client/src/app/videos/+video-watch/video-duration-formatter.pipe.ts
+++ b/client/src/app/+videos/+video-watch/video-duration-formatter.pipe.ts
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.html b/client/src/app/+videos/+video-watch/video-watch-playlist.component.html
index 246ef83cf..246ef83cf 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.html
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss b/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss
index 0b0a2a899..0b0a2a899 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss
diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
index 2c21be643..2c21be643 100644
--- a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
diff --git a/client/src/app/videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
index d8fecb87d..d8fecb87d 100644
--- a/client/src/app/videos/+video-watch/video-watch-routing.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 0447268f0..0447268f0 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 2e083982e..2e083982e 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 5b0b34c80..5b0b34c80 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
diff --git a/client/src/app/videos/+video-watch/video-watch.module.ts b/client/src/app/+videos/+video-watch/video-watch.module.ts
index a1c54f065..421170d81 100644
--- a/client/src/app/videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.module.ts
@@ -7,7 +7,7 @@ import { SharedModerationModule } from '@app/shared/shared-moderation'
 import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
 import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
 import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { RecommendationsModule } from '@app/videos/recommendations/recommendations.module'
+import { RecommendationsModule } from './recommendations/recommendations.module'
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { VideoCommentAddComponent } from './comment/video-comment-add.component'
 import { VideoCommentComponent } from './comment/video-comment.component'
diff --git a/client/src/app/videos/index.ts b/client/src/app/+videos/index.ts
index 028a5854b..028a5854b 100644
--- a/client/src/app/videos/index.ts
+++ b/client/src/app/+videos/index.ts
diff --git a/client/src/app/videos/video-list/index.ts b/client/src/app/+videos/video-list/index.ts
index af1bd58b7..af1bd58b7 100644
--- a/client/src/app/videos/video-list/index.ts
+++ b/client/src/app/+videos/video-list/index.ts
diff --git a/client/src/app/videos/video-list/overview/index.ts b/client/src/app/+videos/video-list/overview/index.ts
index e6cfa4802..e6cfa4802 100644
--- a/client/src/app/videos/video-list/overview/index.ts
+++ b/client/src/app/+videos/video-list/overview/index.ts
diff --git a/client/src/app/videos/video-list/overview/overview.service.ts b/client/src/app/+videos/video-list/overview/overview.service.ts
index 4458454d5..4458454d5 100644
--- a/client/src/app/videos/video-list/overview/overview.service.ts
+++ b/client/src/app/+videos/video-list/overview/overview.service.ts
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.html b/client/src/app/+videos/video-list/overview/video-overview.component.html
index ca986c634..ca986c634 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.html
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.html
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.scss b/client/src/app/+videos/video-list/overview/video-overview.component.scss
index c1d10188a..c1d10188a 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.scss
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.scss
diff --git a/client/src/app/videos/video-list/overview/video-overview.component.ts b/client/src/app/+videos/video-list/overview/video-overview.component.ts
index b3be1d7b5..b3be1d7b5 100644
--- a/client/src/app/videos/video-list/overview/video-overview.component.ts
+++ b/client/src/app/+videos/video-list/overview/video-overview.component.ts
diff --git a/client/src/app/videos/video-list/overview/videos-overview.model.ts b/client/src/app/+videos/video-list/overview/videos-overview.model.ts
index 6765ad9b7..6765ad9b7 100644
--- a/client/src/app/videos/video-list/overview/videos-overview.model.ts
+++ b/client/src/app/+videos/video-list/overview/videos-overview.model.ts
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/+videos/video-list/video-local.component.ts
index b4c71ac49..b4c71ac49 100644
--- a/client/src/app/videos/video-list/video-local.component.ts
+++ b/client/src/app/+videos/video-list/video-local.component.ts
diff --git a/client/src/app/videos/video-list/video-most-liked.component.ts b/client/src/app/+videos/video-list/video-most-liked.component.ts
index ca14851bb..ca14851bb 100644
--- a/client/src/app/videos/video-list/video-most-liked.component.ts
+++ b/client/src/app/+videos/video-list/video-most-liked.component.ts
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/+videos/video-list/video-recently-added.component.ts
index c9395133f..c9395133f 100644
--- a/client/src/app/videos/video-list/video-recently-added.component.ts
+++ b/client/src/app/+videos/video-list/video-recently-added.component.ts
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/+videos/video-list/video-trending.component.ts
index 10eab18de..10eab18de 100644
--- a/client/src/app/videos/video-list/video-trending.component.ts
+++ b/client/src/app/+videos/video-list/video-trending.component.ts
diff --git a/client/src/app/videos/video-list/video-user-subscriptions.component.ts b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
index 41ad9b277..41ad9b277 100644
--- a/client/src/app/videos/video-list/video-user-subscriptions.component.ts
+++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/+videos/videos-routing.module.ts
index 16b65be63..e0e877fc6 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/+videos/videos-routing.module.ts
@@ -1,17 +1,17 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-import { VideoLocalComponent } from '@app/videos/video-list/video-local.component'
 import { MetaGuard } from '@ngx-meta/core'
+import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
+import { VideoLocalComponent } from './video-list/video-local.component'
+import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
 import { VideoRecentlyAddedComponent } from './video-list/video-recently-added.component'
 import { VideoTrendingComponent } from './video-list/video-trending.component'
-import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
-import { VideosComponent } from './videos.component'
 import { VideoUserSubscriptionsComponent } from './video-list/video-user-subscriptions.component'
-import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
+import { VideosComponent } from './videos.component'
 
 const videosRoutes: Routes = [
   {
-    path: 'videos',
+    path: '',
     component: VideosComponent,
     canActivateChild: [ MetaGuard ],
     children: [
@@ -91,7 +91,7 @@ const videosRoutes: Routes = [
       },
       {
         path: 'upload',
-        loadChildren: () => import('@app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
+        loadChildren: () => import('@app/+videos/+video-edit/video-add.module').then(m => m.VideoAddModule),
         data: {
           meta: {
             title: 'Upload a video'
@@ -100,7 +100,7 @@ const videosRoutes: Routes = [
       },
       {
         path: 'update/:uuid',
-        loadChildren: () => import('@app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
+        loadChildren: () => import('@app/+videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule),
         data: {
           meta: {
             title: 'Edit a video'
@@ -109,7 +109,7 @@ const videosRoutes: Routes = [
       },
       {
         path: 'watch',
-        loadChildren: () => import('@app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
+        loadChildren: () => import('@app/+videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule),
         data: {
           preload: 3000
         }
diff --git a/client/src/app/videos/videos.component.ts b/client/src/app/+videos/videos.component.ts
index 585a3ad9a..585a3ad9a 100644
--- a/client/src/app/videos/videos.component.ts
+++ b/client/src/app/+videos/videos.component.ts
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/+videos/videos.module.ts
index 217e5bb50..1cf68bf83 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/+videos/videos.module.ts
@@ -4,6 +4,7 @@ import { SharedGlobalIconModule } from '@app/shared/shared-icons'
 import { SharedMainModule } from '@app/shared/shared-main'
 import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
 import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
+import { OverviewService } from './video-list'
 import { VideoOverviewComponent } from './video-list/overview/video-overview.component'
 import { VideoLocalComponent } from './video-list/video-local.component'
 import { VideoMostLikedComponent } from './video-list/video-most-liked.component'
@@ -39,6 +40,8 @@ import { VideosComponent } from './videos.component'
     VideosComponent
   ],
 
-  providers: []
+  providers: [
+    OverviewService
+  ]
 })
 export class VideosModule { }
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index ceda41415..a39be17dc 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -4,6 +4,7 @@ import { AppComponent } from '@app/app.component'
 import { CustomReuseStrategy } from '@app/core/routing/custom-reuse-strategy'
 import { MenuGuards } from '@app/core/routing/menu-guard.service'
 import { PreloadSelectedModulesList } from './core'
+import { EmptyComponent } from './empty.component'
 
 const routes: Routes = [
   {
@@ -37,8 +38,24 @@ const routes: Routes = [
     loadChildren: () => import('./+signup/+register/register.module').then(m => m.RegisterModule)
   },
   {
+    path: 'reset-password',
+    loadChildren: () => import('./+reset-password/reset-password.module').then(m => m.ResetPasswordModule)
+  },
+  {
+    path: 'login',
+    loadChildren: () => import('./+login/login.module').then(m => m.LoginModule)
+  },
+  {
+    path: 'search',
+    loadChildren: () => import('./+search/search.module').then(m => m.SearchModule)
+  },
+  {
+    path: 'videos',
+    loadChildren: () => import('./+videos/videos.module').then(m => m.VideosModule)
+  },
+  {
     path: '',
-    component: AppComponent // Avoid 404, app component will redirect dynamically
+    component: EmptyComponent // Avoid 404, app component will redirect dynamically
   },
   {
     path: '**',
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 7fbc6463b..c6e9d7315 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -4,15 +4,13 @@ import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular
 import { BrowserModule } from '@angular/platform-browser'
 import { ServerService } from '@app/core'
 import localeOc from '@app/helpers/locales/oc'
-import { ResetPasswordModule } from '@app/reset-password'
-import { SearchModule } from '@app/search'
 import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
 import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
 import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
-import { LoginModule } from './login'
+import { HighlightPipe } from './header/highlight.pipe'
 import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
 import { ConfirmComponent } from './modal/confirm.component'
 import { CustomModalComponent } from './modal/custom-modal.component'
@@ -24,7 +22,6 @@ import { SharedGlobalIconModule } from './shared/shared-icons'
 import { SharedInstanceModule } from './shared/shared-instance'
 import { SharedMainModule } from './shared/shared-main'
 import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
-import { VideosModule } from './videos'
 
 registerLocaleData(localeOc, 'oc')
 
@@ -41,6 +38,7 @@ registerLocaleData(localeOc, 'oc')
     HeaderComponent,
     SearchTypeaheadComponent,
     SuggestionComponent,
+    HighlightPipe,
 
     CustomModalComponent,
     WelcomeModalComponent,
@@ -58,12 +56,6 @@ registerLocaleData(localeOc, 'oc')
     SharedGlobalIconModule,
     SharedInstanceModule,
 
-    LoginModule,
-    ResetPasswordModule,
-    SearchModule,
-
-    VideosModule,
-
     MetaModule.forRoot({
       provide: MetaLoader,
       useFactory: (serverService: ServerService) => {
diff --git a/client/src/app/empty.component.ts b/client/src/app/empty.component.ts
new file mode 100644
index 000000000..5cde05a32
--- /dev/null
+++ b/client/src/app/empty.component.ts
@@ -0,0 +1,10 @@
+
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'my-empty',
+  template: ''
+})
+export class EmptyComponent {
+
+}
diff --git a/client/src/app/search/highlight.pipe.ts b/client/src/app/header/highlight.pipe.ts
index 50ee5c1bd..50ee5c1bd 100644
--- a/client/src/app/search/highlight.pipe.ts
+++ b/client/src/app/header/highlight.pipe.ts
diff --git a/client/src/app/login/index.ts b/client/src/app/login/index.ts
deleted file mode 100644
index f1301d8b5..000000000
--- a/client/src/app/login/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './login-routing.module'
-export * from './login.component'
-export * from './login.module'
diff --git a/client/src/app/reset-password/index.ts b/client/src/app/reset-password/index.ts
deleted file mode 100644
index 438dc576a..000000000
--- a/client/src/app/reset-password/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './reset-password-routing.module'
-export * from './reset-password.component'
-export * from './reset-password.module'
diff --git a/client/src/app/search/index.ts b/client/src/app/search/index.ts
deleted file mode 100644
index 40f4e021f..000000000
--- a/client/src/app/search/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './search-routing.module'
-export * from './search.component'
-export * from './search.module'
diff --git a/client/src/app/search/advanced-search.model.ts b/client/src/app/shared/shared-search/advanced-search.model.ts
index 516854a8c..516854a8c 100644
--- a/client/src/app/search/advanced-search.model.ts
+++ b/client/src/app/shared/shared-search/advanced-search.model.ts
diff --git a/client/src/app/shared/shared-search/index.ts b/client/src/app/shared/shared-search/index.ts
new file mode 100644
index 000000000..f687f6767
--- /dev/null
+++ b/client/src/app/shared/shared-search/index.ts
@@ -0,0 +1,3 @@
+export * from './advanced-search.model'
+export * from './search.service'
+export * from './shared-search.module'
diff --git a/client/src/app/search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts
index 36342034f..96b954c99 100644
--- a/client/src/app/search/search.service.ts
+++ b/client/src/app/shared/shared-search/search.service.ts
@@ -4,11 +4,10 @@ import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
 import { peertubeLocalStorage } from '@app/helpers'
-import { AdvancedSearch } from '@app/search/advanced-search.model'
 import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
-import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models'
-import { SearchTargetType } from '@shared/models/search/search-target-query.model'
-import { environment } from '../../environments/environment'
+import { ResultList, SearchTargetType, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models'
+import { environment } from '../../../environments/environment'
+import { AdvancedSearch } from './advanced-search.model'
 
 @Injectable()
 export class SearchService {
diff --git a/client/src/app/shared/shared-search/shared-search.module.ts b/client/src/app/shared/shared-search/shared-search.module.ts
new file mode 100644
index 000000000..134300d88
--- /dev/null
+++ b/client/src/app/shared/shared-search/shared-search.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core'
+import { SharedMainModule } from '../shared-main'
+import { SearchService } from './search.service'
+
+@NgModule({
+  imports: [
+    SharedMainModule
+  ],
+
+  declarations: [
+  ],
+
+  exports: [
+  ],
+
+  providers: [
+    SearchService
+  ]
+})
+export class SharedSearchModule { }