diff --git a/apps/angular/31-module-to-standalone/src/app/app.component.ts b/apps/angular/31-module-to-standalone/src/app/app.component.ts
index 986df84b5..6656eedb6 100644
--- a/apps/angular/31-module-to-standalone/src/app/app.component.ts
+++ b/apps/angular/31-module-to-standalone/src/app/app.component.ts
@@ -1,7 +1,9 @@
 import { Component } from '@angular/core';
+import { RouterLink, RouterOutlet } from '@angular/router';
 
 @Component({
   selector: 'app-root',
+  imports: [RouterLink, RouterOutlet],
   template: `
     <div class="flex gap-2">
       <button
@@ -25,6 +27,5 @@ import { Component } from '@angular/core';
   host: {
     class: 'flex flex-col p-4 gap-3',
   },
-  standalone: false,
 })
 export class AppComponent {}
diff --git a/apps/angular/31-module-to-standalone/src/app/app.config.ts b/apps/angular/31-module-to-standalone/src/app/app.config.ts
new file mode 100644
index 000000000..0700d1c43
--- /dev/null
+++ b/apps/angular/31-module-to-standalone/src/app/app.config.ts
@@ -0,0 +1,7 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideRouter } from '@angular/router';
+import { routes } from './app.routes';
+
+export const appConfig: ApplicationConfig = {
+  providers: [provideRouter(routes)],
+};
diff --git a/apps/angular/31-module-to-standalone/src/app/app.module.ts b/apps/angular/31-module-to-standalone/src/app/app.module.ts
deleted file mode 100644
index c795a11b9..000000000
--- a/apps/angular/31-module-to-standalone/src/app/app.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { MainShellModule } from '@angular-challenges/module-to-standalone/shell';
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { AppComponent } from './app.component';
-
-@NgModule({
-  declarations: [AppComponent],
-  imports: [BrowserModule, MainShellModule],
-  bootstrap: [AppComponent],
-})
-export class AppModule {}
diff --git a/apps/angular/31-module-to-standalone/src/app/app.routes.ts b/apps/angular/31-module-to-standalone/src/app/app.routes.ts
new file mode 100644
index 000000000..3f3f3ccdd
--- /dev/null
+++ b/apps/angular/31-module-to-standalone/src/app/app.routes.ts
@@ -0,0 +1,12 @@
+import { Routes } from '@angular/router';
+
+export const routes: Routes = [
+  {
+    path: '',
+    loadChildren: () =>
+      import('@angular-challenges/module-to-standalone/shell').then(
+        (r) => r.appRoutes,
+      ),
+  },
+  { path: '**', redirectTo: '' },
+];
diff --git a/apps/angular/31-module-to-standalone/src/main.ts b/apps/angular/31-module-to-standalone/src/main.ts
index 16de2365d..f3a7223da 100644
--- a/apps/angular/31-module-to-standalone/src/main.ts
+++ b/apps/angular/31-module-to-standalone/src/main.ts
@@ -1,6 +1,7 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { AppModule } from './app/app.module';
+import { bootstrapApplication } from '@angular/platform-browser';
+import { AppComponent } from './app/app.component';
+import { appConfig } from './app/app.config';
 
-platformBrowserDynamic()
-  .bootstrapModule(AppModule)
-  .catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
+  console.error(err),
+);
diff --git a/libs/module-to-standalone/admin/feature/src/index.ts b/libs/module-to-standalone/admin/feature/src/index.ts
index 76c8330f9..ed09fd22f 100644
--- a/libs/module-to-standalone/admin/feature/src/index.ts
+++ b/libs/module-to-standalone/admin/feature/src/index.ts
@@ -1 +1 @@
-export * from './lib/admin-feature.module';
+export * from './lib/admin-feature.routes';
diff --git a/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts b/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts
deleted file mode 100644
index 84e893eeb..000000000
--- a/libs/module-to-standalone/admin/feature/src/lib/admin-feature.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-@NgModule({
-  declarations: [],
-  imports: [
-    CommonModule,
-    RouterModule.forChild([
-      {
-        path: '',
-        loadChildren: () =>
-          import('./dashboard/dashboard.component').then(
-            (m) => m.DashboardModule,
-          ),
-      },
-      {
-        path: 'create-user',
-        loadChildren: () =>
-          import('./create-user/create-user.component').then(
-            (m) => m.CreateUserModule,
-          ),
-      },
-    ]),
-  ],
-})
-export class AdminFeatureModule {}
diff --git a/libs/module-to-standalone/admin/feature/src/lib/admin-feature.routes.ts b/libs/module-to-standalone/admin/feature/src/lib/admin-feature.routes.ts
new file mode 100644
index 000000000..ecf093c5d
--- /dev/null
+++ b/libs/module-to-standalone/admin/feature/src/lib/admin-feature.routes.ts
@@ -0,0 +1,12 @@
+import { Routes } from '@angular/router';
+
+export const adminFeatureRoutes: Routes = [
+  {
+    path: '',
+    loadComponent: () => import('./dashboard/dashboard.component'),
+  },
+  {
+    path: 'create-user',
+    loadComponent: () => import('./create-user/create-user.component'),
+  },
+];
diff --git a/libs/module-to-standalone/admin/feature/src/lib/create-user/create-user.component.ts b/libs/module-to-standalone/admin/feature/src/lib/create-user/create-user.component.ts
index 6a2d4cfd4..4a17b8e3e 100644
--- a/libs/module-to-standalone/admin/feature/src/lib/create-user/create-user.component.ts
+++ b/libs/module-to-standalone/admin/feature/src/lib/create-user/create-user.component.ts
@@ -1,25 +1,16 @@
-import { Component, NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
 
 @Component({
   selector: 'lib-create-user',
+  imports: [RouterLink],
   template: `
     Create User Form
-
     <button
       routerLink=".."
       class="ml-5 rounded-lg border bg-gray-700 p-2 text-white">
       Back
     </button>
   `,
-  standalone: false,
-})
-export class CreateUserComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([{ path: '', component: CreateUserComponent }]),
-  ],
-  declarations: [CreateUserComponent],
 })
-export class CreateUserModule {}
+export default class CreateUserComponent {}
diff --git a/libs/module-to-standalone/admin/feature/src/lib/dashboard/dashboard.component.ts b/libs/module-to-standalone/admin/feature/src/lib/dashboard/dashboard.component.ts
index 801efb520..39521be67 100644
--- a/libs/module-to-standalone/admin/feature/src/lib/dashboard/dashboard.component.ts
+++ b/libs/module-to-standalone/admin/feature/src/lib/dashboard/dashboard.component.ts
@@ -1,25 +1,16 @@
-import { Component, NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
 
 @Component({
   selector: 'lib-dashboard',
+  imports: [RouterLink],
   template: `
     Dashboard
-
     <button
       routerLink="create-user"
       class="ml-10 rounded-lg border bg-gray-700 p-2 text-white">
       Create User
     </button>
   `,
-  standalone: false,
-})
-export class DashboardComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([{ path: '', component: DashboardComponent }]),
-  ],
-  declarations: [DashboardComponent],
 })
-export class DashboardModule {}
+export default class DashboardComponent {}
diff --git a/libs/module-to-standalone/admin/shared/src/lib/authorized.guard.ts b/libs/module-to-standalone/admin/shared/src/lib/authorized.guard.ts
index 006dea2f3..276108e27 100644
--- a/libs/module-to-standalone/admin/shared/src/lib/authorized.guard.ts
+++ b/libs/module-to-standalone/admin/shared/src/lib/authorized.guard.ts
@@ -1,23 +1,16 @@
-import { CanActivate, Router, UrlTree } from '@angular/router';
+import { CanMatchFn, Router } from '@angular/router';
 
 import { AuthorizationService } from '@angular-challenges/module-to-standalone/core/service';
-import { Injectable } from '@angular/core';
-import { Observable, map } from 'rxjs';
+import { inject } from '@angular/core';
+import { map } from 'rxjs';
 
-@Injectable({
-  providedIn: 'root',
-})
-export class IsAuthorizedGuard implements CanActivate {
-  constructor(
-    private authorizationService: AuthorizationService,
-    private router: Router,
-  ) {}
+export const IsAuthorizedGuard: CanMatchFn = () => {
+  const authorizationService = inject(AuthorizationService);
+  const router = inject(Router);
 
-  canActivate(): Observable<boolean | UrlTree> {
-    return this.authorizationService.isAuthorized$.pipe(
-      map((isAuthorized) =>
-        isAuthorized ? true : this.router.createUrlTree(['forbidden']),
-      ),
-    );
-  }
-}
+  return authorizationService.isAuthorized$.pipe(
+    map((isAuthorized) =>
+      isAuthorized ? true : router.createUrlTree(['forbidden']),
+    ),
+  );
+};
diff --git a/libs/module-to-standalone/core/providers/src/lib/token.provider.ts b/libs/module-to-standalone/core/providers/src/lib/token.provider.ts
index 3f498ee06..132f3fde6 100644
--- a/libs/module-to-standalone/core/providers/src/lib/token.provider.ts
+++ b/libs/module-to-standalone/core/providers/src/lib/token.provider.ts
@@ -4,7 +4,7 @@ import {
   makeEnvironmentProviders,
 } from '@angular/core';
 
-export const TOKEN = new InjectionToken<string[]>('token');
+export const TOKEN = new InjectionToken<string>('token');
 
 export const provideToken = (token: string): EnvironmentProviders => {
   return makeEnvironmentProviders([
diff --git a/libs/module-to-standalone/forbidden/src/index.ts b/libs/module-to-standalone/forbidden/src/index.ts
index 672622f64..dd4219cc6 100644
--- a/libs/module-to-standalone/forbidden/src/index.ts
+++ b/libs/module-to-standalone/forbidden/src/index.ts
@@ -1 +1 @@
-export * from './lib/forbidden.module';
+export { default } from './lib/forbidden.component';
diff --git a/libs/module-to-standalone/forbidden/src/lib/forbidden.component.ts b/libs/module-to-standalone/forbidden/src/lib/forbidden.component.ts
index a5e6e2d77..6f474ee74 100644
--- a/libs/module-to-standalone/forbidden/src/lib/forbidden.component.ts
+++ b/libs/module-to-standalone/forbidden/src/lib/forbidden.component.ts
@@ -5,6 +5,5 @@ import { Component } from '@angular/core';
   template: `
     Forbidden component
   `,
-  standalone: false,
 })
-export class ForbiddenComponent {}
+export default class ForbiddenComponent {}
diff --git a/libs/module-to-standalone/forbidden/src/lib/forbidden.module.ts b/libs/module-to-standalone/forbidden/src/lib/forbidden.module.ts
deleted file mode 100644
index 0b363bf04..000000000
--- a/libs/module-to-standalone/forbidden/src/lib/forbidden.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { ForbiddenComponent } from './forbidden.component';
-
-@NgModule({
-  declarations: [ForbiddenComponent],
-  imports: [
-    CommonModule,
-    RouterModule.forChild([{ path: '', component: ForbiddenComponent }]),
-  ],
-})
-export class ForbiddenModule {}
diff --git a/libs/module-to-standalone/home/src/index.ts b/libs/module-to-standalone/home/src/index.ts
index fe97ad579..5055b06fe 100644
--- a/libs/module-to-standalone/home/src/index.ts
+++ b/libs/module-to-standalone/home/src/index.ts
@@ -1 +1 @@
-export * from './lib/home.module';
+export { default } from './lib/home.component';
diff --git a/libs/module-to-standalone/home/src/lib/home.component.ts b/libs/module-to-standalone/home/src/lib/home.component.ts
index f4b5c2db0..ee774e8ed 100644
--- a/libs/module-to-standalone/home/src/lib/home.component.ts
+++ b/libs/module-to-standalone/home/src/lib/home.component.ts
@@ -1,12 +1,13 @@
 import { TOKEN } from '@angular-challenges/module-to-standalone/core/providers';
 import { AuthorizationService } from '@angular-challenges/module-to-standalone/core/service';
-import { Component, Inject } from '@angular/core';
+import { AsyncPipe } from '@angular/common';
+import { Component, inject } from '@angular/core';
 
 @Component({
   selector: 'lib-home',
+  imports: [AsyncPipe],
   template: `
     Home component
-
     <section class="flex items-center gap-5">
       Authorization :
       <button class="border p-2  " (click)="authorizeService.authorize()">
@@ -20,11 +21,8 @@ import { Component, Inject } from '@angular/core';
 
     <section>LoadedToken {{ token }}</section>
   `,
-  standalone: false,
 })
-export class HomeComponent {
-  constructor(
-    public authorizeService: AuthorizationService,
-    @Inject(TOKEN) public token: string,
-  ) {}
+export default class HomeComponent {
+  readonly authorizeService = inject(AuthorizationService);
+  readonly token = inject(TOKEN);
 }
diff --git a/libs/module-to-standalone/home/src/lib/home.module.ts b/libs/module-to-standalone/home/src/lib/home.module.ts
deleted file mode 100644
index 30ae1ea8a..000000000
--- a/libs/module-to-standalone/home/src/lib/home.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { HomeComponent } from './home.component';
-
-@NgModule({
-  declarations: [HomeComponent],
-  imports: [
-    RouterModule.forChild([{ path: '', component: HomeComponent }]),
-    CommonModule,
-  ],
-})
-export class ModuleToStandaloneHomeModule {}
diff --git a/libs/module-to-standalone/shell/src/index.ts b/libs/module-to-standalone/shell/src/index.ts
index 494d4096f..902420448 100644
--- a/libs/module-to-standalone/shell/src/index.ts
+++ b/libs/module-to-standalone/shell/src/index.ts
@@ -1 +1 @@
-export * from './lib/main-shell.module';
+export * from './lib/main-shell.routes';
diff --git a/libs/module-to-standalone/shell/src/lib/main-shell.module.ts b/libs/module-to-standalone/shell/src/lib/main-shell.module.ts
deleted file mode 100644
index e886da911..000000000
--- a/libs/module-to-standalone/shell/src/lib/main-shell.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { provideToken } from '@angular-challenges/module-to-standalone/core/providers';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { appRoutes } from './main-shell.routes';
-
-@NgModule({
-  imports: [RouterModule.forRoot(appRoutes)],
-  exports: [RouterModule],
-  providers: [provideToken('main-shell-token')],
-})
-export class MainShellModule {}
diff --git a/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts b/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts
index 84f9a8d03..545916f9a 100644
--- a/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts
+++ b/libs/module-to-standalone/shell/src/lib/main-shell.routes.ts
@@ -1,36 +1,34 @@
 import { IsAuthorizedGuard } from '@angular-challenges/module-to-standalone/admin/shared';
-import { Route } from '@angular/router';
+import { provideToken } from '@angular-challenges/module-to-standalone/core/providers';
+import { Routes } from '@angular/router';
 
-export const appRoutes: Route[] = [
-  { path: '', redirectTo: 'home', pathMatch: 'full' },
+export const appRoutes: Routes = [
+  { path: '', pathMatch: 'full', redirectTo: 'home' },
   {
     path: 'home',
-    loadChildren: () =>
-      import('@angular-challenges/module-to-standalone/home').then(
-        (m) => m.ModuleToStandaloneHomeModule,
-      ),
+    providers: [provideToken('main-shell-token')],
+    loadComponent: () =>
+      import('@angular-challenges/module-to-standalone/home'),
   },
   {
     path: 'admin',
-    canActivate: [IsAuthorizedGuard],
+    canMatch: [IsAuthorizedGuard],
     loadChildren: () =>
       import('@angular-challenges/module-to-standalone/admin/feature').then(
-        (m) => m.AdminFeatureModule,
+        (r) => r.adminFeatureRoutes,
       ),
   },
   {
     path: 'user',
     loadChildren: () =>
       import('@angular-challenges/module-to-standalone/user/shell').then(
-        (m) => m.UserShellModule,
+        (r) => r.userShellRoutes,
       ),
   },
 
   {
     path: 'forbidden',
-    loadChildren: () =>
-      import('@angular-challenges/module-to-standalone/forbidden').then(
-        (m) => m.ForbiddenModule,
-      ),
+    loadComponent: () =>
+      import('@angular-challenges/module-to-standalone/forbidden'),
   },
 ];
diff --git a/libs/module-to-standalone/user/contact/src/index.ts b/libs/module-to-standalone/user/contact/src/index.ts
index 8561ea519..fb955e5cb 100644
--- a/libs/module-to-standalone/user/contact/src/index.ts
+++ b/libs/module-to-standalone/user/contact/src/index.ts
@@ -1 +1 @@
-export * from './lib/contact-feature.module';
+export * from './lib/contact-feature.routes';
diff --git a/libs/module-to-standalone/user/contact/src/lib/contact-feature.module.ts b/libs/module-to-standalone/user/contact/src/lib/contact-feature.module.ts
deleted file mode 100644
index 09da407c7..000000000
--- a/libs/module-to-standalone/user/contact/src/lib/contact-feature.module.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-@NgModule({
-  declarations: [],
-  imports: [
-    CommonModule,
-    RouterModule.forChild([
-      {
-        path: '',
-        loadChildren: () =>
-          import('./dashboard/dashboard.component').then(
-            (m) => m.ContactDashboardModule,
-          ),
-      },
-      {
-        path: 'create-contact',
-        loadChildren: () =>
-          import('./create-contact/create-contact.component').then(
-            (m) => m.CreateContactModule,
-          ),
-      },
-    ]),
-  ],
-})
-export class ContactFeatureModule {}
diff --git a/libs/module-to-standalone/user/contact/src/lib/contact-feature.routes.ts b/libs/module-to-standalone/user/contact/src/lib/contact-feature.routes.ts
new file mode 100644
index 000000000..ae0daf48a
--- /dev/null
+++ b/libs/module-to-standalone/user/contact/src/lib/contact-feature.routes.ts
@@ -0,0 +1,12 @@
+import { Routes } from '@angular/router';
+
+export const contactFeatureRoutes: Routes = [
+  {
+    path: '',
+    loadComponent: () => import('./dashboard/dashboard.component'),
+  },
+  {
+    path: 'create-contact',
+    loadComponent: () => import('./create-contact/create-contact.component'),
+  },
+];
diff --git a/libs/module-to-standalone/user/contact/src/lib/create-contact/create-contact.component.ts b/libs/module-to-standalone/user/contact/src/lib/create-contact/create-contact.component.ts
index 9c5cea9ff..95324514e 100644
--- a/libs/module-to-standalone/user/contact/src/lib/create-contact/create-contact.component.ts
+++ b/libs/module-to-standalone/user/contact/src/lib/create-contact/create-contact.component.ts
@@ -1,25 +1,16 @@
-import { Component, NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
 
 @Component({
   selector: 'lib-create-contact',
+  imports: [RouterLink],
   template: `
     Create Contact Form
-
     <button
       routerLink=".."
       class="ml-5 rounded-lg border bg-gray-700 p-2 text-white">
       Back
     </button>
   `,
-  standalone: false,
-})
-export class CreateContactComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([{ path: '', component: CreateContactComponent }]),
-  ],
-  declarations: [CreateContactComponent],
 })
-export class CreateContactModule {}
+export default class CreateContactComponent {}
diff --git a/libs/module-to-standalone/user/contact/src/lib/dashboard/dashboard.component.ts b/libs/module-to-standalone/user/contact/src/lib/dashboard/dashboard.component.ts
index 8e56b721a..907193fd9 100644
--- a/libs/module-to-standalone/user/contact/src/lib/dashboard/dashboard.component.ts
+++ b/libs/module-to-standalone/user/contact/src/lib/dashboard/dashboard.component.ts
@@ -1,25 +1,16 @@
-import { Component, NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
 
 @Component({
   selector: 'lib-contact-dashboard',
+  imports: [RouterLink],
   template: `
     Contact Dashboard
-
     <button
       routerLink="create-contact"
       class="ml-10 rounded-lg border bg-gray-700 p-2 text-white">
       Create contact
     </button>
   `,
-  standalone: false,
-})
-export class ContactDashboardComponent {}
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([{ path: '', component: ContactDashboardComponent }]),
-  ],
-  declarations: [ContactDashboardComponent],
 })
-export class ContactDashboardModule {}
+export default class ContactDashboardComponent {}
diff --git a/libs/module-to-standalone/user/home/src/index.ts b/libs/module-to-standalone/user/home/src/index.ts
index fe97ad579..5055b06fe 100644
--- a/libs/module-to-standalone/user/home/src/index.ts
+++ b/libs/module-to-standalone/user/home/src/index.ts
@@ -1 +1 @@
-export * from './lib/home.module';
+export { default } from './lib/home.component';
diff --git a/libs/module-to-standalone/user/home/src/lib/home.component.ts b/libs/module-to-standalone/user/home/src/lib/home.component.ts
index 253c76622..e167aaa9f 100644
--- a/libs/module-to-standalone/user/home/src/lib/home.component.ts
+++ b/libs/module-to-standalone/user/home/src/lib/home.component.ts
@@ -1,10 +1,8 @@
 import { Component } from '@angular/core';
-
 @Component({
   selector: 'lib-user-home',
   template: `
     User Home component
   `,
-  standalone: false,
 })
-export class UserHomeComponent {}
+export default class UserHomeComponent {}
diff --git a/libs/module-to-standalone/user/home/src/lib/home.module.ts b/libs/module-to-standalone/user/home/src/lib/home.module.ts
deleted file mode 100644
index ceeb49511..000000000
--- a/libs/module-to-standalone/user/home/src/lib/home.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { UserHomeComponent } from './home.component';
-
-@NgModule({
-  declarations: [UserHomeComponent],
-  imports: [
-    RouterModule.forChild([{ path: '', component: UserHomeComponent }]),
-  ],
-})
-export class UserHomeModule {}
diff --git a/libs/module-to-standalone/user/shell/src/index.ts b/libs/module-to-standalone/user/shell/src/index.ts
index 641fd6817..bcebb64da 100644
--- a/libs/module-to-standalone/user/shell/src/index.ts
+++ b/libs/module-to-standalone/user/shell/src/index.ts
@@ -1 +1 @@
-export * from './lib/user-shell.module';
+export * from './lib/user-shell.routes';
diff --git a/libs/module-to-standalone/user/shell/src/lib/user-shell.component.ts b/libs/module-to-standalone/user/shell/src/lib/user-shell.component.ts
index f8d162756..79f086292 100644
--- a/libs/module-to-standalone/user/shell/src/lib/user-shell.component.ts
+++ b/libs/module-to-standalone/user/shell/src/lib/user-shell.component.ts
@@ -1,8 +1,10 @@
 import { TOKEN } from '@angular-challenges/module-to-standalone/core/providers';
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
+import { RouterLink, RouterOutlet } from '@angular/router';
 
 @Component({
   selector: 'lib-user-shell',
+  imports: [RouterLink, RouterOutlet],
   template: `
     -- User Panel --
     <div class="flex items-center gap-2">
@@ -27,8 +29,7 @@ import { Component, Inject } from '@angular/core';
   host: {
     class: 'flex flex-col p-4 gap-3 border border-blue',
   },
-  standalone: false,
 })
 export class UserShellComponent {
-  constructor(@Inject(TOKEN) public token: string) {}
+  readonly token = inject(TOKEN);
 }
diff --git a/libs/module-to-standalone/user/shell/src/lib/user-shell.module.ts b/libs/module-to-standalone/user/shell/src/lib/user-shell.module.ts
deleted file mode 100644
index 433d6f77b..000000000
--- a/libs/module-to-standalone/user/shell/src/lib/user-shell.module.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { provideToken } from '@angular-challenges/module-to-standalone/core/providers';
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { UserShellComponent } from './user-shell.component';
-import { userShellRoutes } from './user-shell.routes';
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(userShellRoutes), RouterModule],
-  declarations: [UserShellComponent],
-  providers: [provideToken('user-token')],
-})
-export class UserShellModule {}
diff --git a/libs/module-to-standalone/user/shell/src/lib/user-shell.routes.ts b/libs/module-to-standalone/user/shell/src/lib/user-shell.routes.ts
index b5813e5d5..86e984253 100644
--- a/libs/module-to-standalone/user/shell/src/lib/user-shell.routes.ts
+++ b/libs/module-to-standalone/user/shell/src/lib/user-shell.routes.ts
@@ -1,24 +1,24 @@
+import { provideToken } from '@angular-challenges/module-to-standalone/core/providers';
 import { Route } from '@angular/router';
 import { UserShellComponent } from './user-shell.component';
 
 export const userShellRoutes: Route[] = [
   {
     path: '',
+    providers: [provideToken('user-token')],
     component: UserShellComponent,
     children: [
       { path: '', redirectTo: 'home', pathMatch: 'full' },
       {
         path: 'home',
-        loadChildren: () =>
-          import('@angular-challenges/module-to-standalone/user/home').then(
-            (m) => m.UserHomeModule,
-          ),
+        loadComponent: () =>
+          import('@angular-challenges/module-to-standalone/user/home'),
       },
       {
         path: 'contact',
         loadChildren: () =>
           import('@angular-challenges/module-to-standalone/user/contact').then(
-            (m) => m.ContactFeatureModule,
+            (r) => r.contactFeatureRoutes,
           ),
       },
     ],