diff --git a/.gitignore b/.gitignore
index c763b375..266478df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 __pycache__
 .DS_Store
 .emacs.desktop*
-tests/data/.*
+tests/data/models
+tests/data/embeddings
 src/.data
 .vscode
 *.gz
diff --git a/tests/conftest.py b/tests/conftest.py
index 45eee757..af0e9e36 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -39,8 +39,8 @@ def model_dir(search_config):
     # Generate Image Embeddings from Test Images
     content_config = ContentConfig()
     content_config.image = ImageContentConfig(
-        input_directory = 'tests/data',
-        embeddings_file = model_dir.joinpath('.image_embeddings.pt'),
+        input_directory = 'tests/data/images',
+        embeddings_file = model_dir.joinpath('image_embeddings.pt'),
         batch_size = 10,
         use_xmp_metadata = False)
 
@@ -48,10 +48,10 @@ def model_dir(search_config):
 
     # Generate Notes Embeddings from Test Notes
     content_config.org = TextContentConfig(
-        input_files = ['tests/data/main_readme.org', 'tests/data/interface_emacs_readme.org'],
-        input_filter = None,
-        compressed_jsonl = model_dir.joinpath('.notes.jsonl.gz'),
-        embeddings_file = model_dir.joinpath('.note_embeddings.pt'))
+        input_files = None,
+        input_filter = 'tests/data/notes/*.org',
+        compressed_jsonl = model_dir.joinpath('notes.jsonl.gz'),
+        embeddings_file = model_dir.joinpath('note_embeddings.pt'))
 
     asymmetric.setup(content_config.org, search_config.asymmetric, regenerate=False, verbose=True)
 
@@ -62,15 +62,15 @@ def model_dir(search_config):
 def content_config(model_dir):
     content_config = ContentConfig()
     content_config.org = TextContentConfig(
-        input_files = ['tests/data/main_readme.org', 'tests/data/interface_emacs_readme.org'],
-        input_filter = None,
-        compressed_jsonl = model_dir.joinpath('.notes.jsonl.gz'),
-        embeddings_file = model_dir.joinpath('.note_embeddings.pt'))
+        input_files = None,
+        input_filter = 'tests/data/notes/*.org',
+        compressed_jsonl = model_dir.joinpath('notes.jsonl.gz'),
+        embeddings_file = model_dir.joinpath('note_embeddings.pt'))
 
     content_config.image = ImageContentConfig(
-        input_directory = 'tests/data',
-        embeddings_file = model_dir.joinpath('.image_embeddings.pt'),
+        input_directory = 'tests/data/images',
+        embeddings_file = model_dir.joinpath('image_embeddings.pt'),
         batch_size = 10,
         use_xmp_metadata = False)
 
-    return content_config
+    return content_config
\ No newline at end of file
diff --git a/tests/data/guineapig_grass.jpg b/tests/data/images/guineapig_grass.jpg
similarity index 100%
rename from tests/data/guineapig_grass.jpg
rename to tests/data/images/guineapig_grass.jpg
diff --git a/tests/data/horse_dog.jpg b/tests/data/images/horse_dog.jpg
similarity index 100%
rename from tests/data/horse_dog.jpg
rename to tests/data/images/horse_dog.jpg
diff --git a/tests/data/kitten_park.jpg b/tests/data/images/kitten_park.jpg
similarity index 100%
rename from tests/data/kitten_park.jpg
rename to tests/data/images/kitten_park.jpg
diff --git a/tests/data/otzi.beancount b/tests/data/ledger/otzi.beancount
similarity index 100%
rename from tests/data/otzi.beancount
rename to tests/data/ledger/otzi.beancount
diff --git a/tests/data/music.org b/tests/data/music/music.org
similarity index 100%
rename from tests/data/music.org
rename to tests/data/music/music.org
diff --git a/tests/data/interface_emacs_readme.org b/tests/data/notes/interface_emacs_readme.org
similarity index 100%
rename from tests/data/interface_emacs_readme.org
rename to tests/data/notes/interface_emacs_readme.org
diff --git a/tests/data/main_readme.org b/tests/data/notes/main_readme.org
similarity index 100%
rename from tests/data/main_readme.org
rename to tests/data/notes/main_readme.org