diff --git a/crates/frilvault-core/src/app/frilvault.rs b/crates/frilvault-core/src/app/frilvault.rs
index e5b06ff..d2ba223 100644
--- a/crates/frilvault-core/src/app/frilvault.rs
+++ b/crates/frilvault-core/src/app/frilvault.rs
@@ -2,9 +2,8 @@ use std::path::{Path, PathBuf};
 
 use crate::{
     FrilVaultResult,
-    note::NoteService,
+    note::{NoteRepository, NoteService},
     runtime::VaultContext,
-    storage::NoteRepository,
     workspace::{PathResolver, WorkspaceIndexRepository, WorkspaceRepository, WorkspaceService},
 };
 
diff --git a/crates/frilvault-core/src/lib.rs b/crates/frilvault-core/src/lib.rs
index ed91fe4..cff3049 100644
--- a/crates/frilvault-core/src/lib.rs
+++ b/crates/frilvault-core/src/lib.rs
@@ -4,7 +4,6 @@ mod error;
 mod note;
 mod parser;
 mod runtime;
-mod storage;
 mod workspace;
 
 pub use app::FrilVault;
diff --git a/crates/frilvault-core/src/note/mod.rs b/crates/frilvault-core/src/note/mod.rs
index dc49d74..4b13ac8 100644
--- a/crates/frilvault-core/src/note/mod.rs
+++ b/crates/frilvault-core/src/note/mod.rs
@@ -1,7 +1,9 @@
 mod dto;
 mod entity;
+mod note_repository;
 mod note_service;
 
 pub use dto::*;
 pub use entity::*;
+pub use note_repository::*;
 pub use note_service::*;
diff --git a/crates/frilvault-core/src/storage/repository.rs b/crates/frilvault-core/src/note/note_repository.rs
similarity index 100%
rename from crates/frilvault-core/src/storage/repository.rs
rename to crates/frilvault-core/src/note/note_repository.rs
diff --git a/crates/frilvault-core/src/runtime/vault_context.rs b/crates/frilvault-core/src/runtime/vault_context.rs
index d1d1ace..1002d10 100644
--- a/crates/frilvault-core/src/runtime/vault_context.rs
+++ b/crates/frilvault-core/src/runtime/vault_context.rs
@@ -2,9 +2,8 @@ use std::path::{Path, PathBuf};
 
 use crate::{
     FrilVaultResult,
-    note::{NoteFile, NoteFileRecord},
+    note::{NoteFile, NoteFileRecord, NoteRepository},
     runtime::NoteCache,
-    storage::NoteRepository,
     workspace::{WorkspaceIndex, WorkspaceIndexRepository},
 };
 
diff --git a/crates/frilvault-core/src/storage/mod.rs b/crates/frilvault-core/src/storage/mod.rs
deleted file mode 100644
index 5b40278..0000000
--- a/crates/frilvault-core/src/storage/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod repository;
-
-pub use repository::*;
diff --git a/crates/frilvault-core/src/tests/helper.rs b/crates/frilvault-core/src/tests/helper.rs
index 118a4b8..28f395f 100644
--- a/crates/frilvault-core/src/tests/helper.rs
+++ b/crates/frilvault-core/src/tests/helper.rs
@@ -4,9 +4,8 @@ use std::{
 };
 
 use crate::{
-    note::NoteService,
+    note::{NoteRepository, NoteService},
     runtime::VaultContext,
-    storage::NoteRepository,
     workspace::{PathResolver, WorkspaceIndexRepository, WorkspaceRepository, WorkspaceService},
 };
 
diff --git a/crates/frilvault-core/src/workspace/repository/workspace_index_repository.rs b/crates/frilvault-core/src/workspace/repository/workspace_index_repository.rs
index 7cd85e6..e435910 100644
--- a/crates/frilvault-core/src/workspace/repository/workspace_index_repository.rs
+++ b/crates/frilvault-core/src/workspace/repository/workspace_index_repository.rs
@@ -2,7 +2,7 @@ use std::{fs, path::Path};
 
 use crate::{
     FrilVaultResult, RepairSuggestion,
-    storage::NoteRepository,
+    note::NoteRepository,
     workspace::{FileMove, IndexDiff, IndexedFile, PathResolver, WorkspaceIndex},
 };