diff --git a/ONMIR/Feature/NewBook/BookSearchRepresentation.swift b/ONMIR/Feature/BookSearch/BookSearchRepresentation.swift
similarity index 100%
rename from ONMIR/Feature/NewBook/BookSearchRepresentation.swift
rename to ONMIR/Feature/BookSearch/BookSearchRepresentation.swift
diff --git a/ONMIR/Feature/NewBook/NewBookViewController.swift b/ONMIR/Feature/BookSearch/BookSearchViewController.swift
similarity index 97%
rename from ONMIR/Feature/NewBook/NewBookViewController.swift
rename to ONMIR/Feature/BookSearch/BookSearchViewController.swift
index 86982fe..0d63fdf 100644
--- a/ONMIR/Feature/NewBook/NewBookViewController.swift
+++ b/ONMIR/Feature/BookSearch/BookSearchViewController.swift
@@ -1,7 +1,7 @@
 import SnapKit
 import UIKit
 
-public final class NewBookViewController: UIViewController {
+public final class BookSearchViewController: UIViewController {
   private lazy var searchController: UISearchController = {
     let searchController = UISearchController(searchResultsController: nil)
     searchController.searchBar.placeholder = "Search by title, author or keyword"
@@ -26,7 +26,7 @@ public final class NewBookViewController: UIViewController {
     return collectionView
   }()
 
-  private let viewModel = NewBookViewModel()
+  private let viewModel = BookSearchViewModel()
 
   private typealias DataSource = UICollectionViewDiffableDataSource<Int, BookSearchRepresentation>
   private typealias Snapshot = NSDiffableDataSourceSnapshot<Int, BookSearchRepresentation>
@@ -291,7 +291,7 @@ public final class NewBookViewController: UIViewController {
   }
 }
 
-extension NewBookViewController: UICollectionViewDelegate {
+extension BookSearchViewController: UICollectionViewDelegate {
   public func collectionView(
     _ collectionView: UICollectionView,
     didSelectItemAt indexPath: IndexPath
@@ -313,7 +313,7 @@ extension NewBookViewController: UICollectionViewDelegate {
   }
 }
 
-extension NewBookViewController: UISearchBarDelegate {
+extension BookSearchViewController: UISearchBarDelegate {
   public func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) {
     if searchText.isEmpty {
       searchTask?.cancel()
@@ -325,7 +325,7 @@ extension NewBookViewController: UISearchBarDelegate {
   }
 }
 
-extension NewBookViewController: UISearchResultsUpdating {
+extension BookSearchViewController: UISearchResultsUpdating {
   public func updateSearchResults(for searchController: UISearchController) {
     guard let searchText = searchController.searchBar.text, !searchText.isEmpty else { return }
     debouncedSearch(query: searchText)
diff --git a/ONMIR/Feature/NewBook/NewBookViewModel.swift b/ONMIR/Feature/BookSearch/BookSearchViewModel.swift
similarity index 98%
rename from ONMIR/Feature/NewBook/NewBookViewModel.swift
rename to ONMIR/Feature/BookSearch/BookSearchViewModel.swift
index bbbdcb5..28a8d4e 100644
--- a/ONMIR/Feature/NewBook/NewBookViewModel.swift
+++ b/ONMIR/Feature/BookSearch/BookSearchViewModel.swift
@@ -4,7 +4,7 @@ import Observation
 
 @MainActor
 @Observable
-final class NewBookViewModel {
+final class BookSearchViewModel {
   private(set) var books: [BookSearchRepresentation] = []
   private(set) var selectedBook: BookSearchRepresentation?
   
diff --git a/ONMIR/Feature/NewBook/Components/SearchResultBookCell.swift b/ONMIR/Feature/BookSearch/Components/SearchResultBookCell.swift
similarity index 98%
rename from ONMIR/Feature/NewBook/Components/SearchResultBookCell.swift
rename to ONMIR/Feature/BookSearch/Components/SearchResultBookCell.swift
index c1ed86c..d93f1cf 100644
--- a/ONMIR/Feature/NewBook/Components/SearchResultBookCell.swift
+++ b/ONMIR/Feature/BookSearch/Components/SearchResultBookCell.swift
@@ -2,7 +2,7 @@ import Nuke
 import SnapKit
 import UIKit
 
-extension NewBookViewController {
+extension BookSearchViewController {
   final class BookCell: UICollectionViewCell {
     private let coverImageView: UIImageView = {
       let imageView = UIImageView()
diff --git a/ONMIR/Feature/NewBook/Components/SelectedBookView.swift b/ONMIR/Feature/BookSearch/Components/SelectedBookView.swift
similarity index 98%
rename from ONMIR/Feature/NewBook/Components/SelectedBookView.swift
rename to ONMIR/Feature/BookSearch/Components/SelectedBookView.swift
index 9e3ab76..a71b4cb 100644
--- a/ONMIR/Feature/NewBook/Components/SelectedBookView.swift
+++ b/ONMIR/Feature/BookSearch/Components/SelectedBookView.swift
@@ -2,7 +2,7 @@ import Nuke
 import SnapKit
 import UIKit
 
-extension NewBookViewController {
+extension BookSearchViewController {
   final class SelectedBookView: UIView {
     private let containerView: UIView = {
       let view = UIView()
diff --git a/ONMIR/Feature/Home/HomeViewController.swift b/ONMIR/Feature/Home/HomeViewController.swift
index 1447160..4d2d830 100644
--- a/ONMIR/Feature/Home/HomeViewController.swift
+++ b/ONMIR/Feature/Home/HomeViewController.swift
@@ -125,7 +125,7 @@ public final class HomeViewController: UIViewController {
     }
 
     @objc private func didTapAddBookButton() {
-        let destination = NewBookViewController { self.dismiss(animated: true) }
+let destination = BookSearchViewController { [weak self] in self?.dismiss(animated: true) }
         destination.modalPresentationStyle = .popover
         self.present(destination, animated: true)
     }