diff --git a/.github/README.md b/.github/README.md
index b14b9a8b..97e18b20 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -99,7 +99,7 @@ To stop playing press Ctrl+C in either the terminal or mpv
 <details><summary>List all subcommands</summary>
 
     $ library
-    library (v2.9.066; 88 subcommands)
+    library (v2.9.067; 87 subcommands)
 
     Create database subcommands:
     ╭─────────────────┬──────────────────────────────────────────╮
@@ -167,8 +167,6 @@ To stop playing press Ctrl+C in either the terminal or mpv
     ├─────────────────┼─────────────────────────────────────────────────────────────────────┤
     │ merge-folders   │ Merge two or more file trees, check for conflicts before merging    │
     ├─────────────────┼─────────────────────────────────────────────────────────────────────┤
-    │ rel-mv          │ Move files preserving parent folder hierarchy                       │
-    ├─────────────────┼─────────────────────────────────────────────────────────────────────┤
     │ mergerfs-cp     │ cp files with reflink on mergerfs                                   │
     ├─────────────────┼─────────────────────────────────────────────────────────────────────┤
     │ scatter         │ Scatter files between folders or disks                              │
@@ -1230,6 +1228,12 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
     $ library merge-mv -h
     usage: library merge-mv SOURCE ... DEST [--simulate] [--ext EXT]
 
+    merging-move: combine file trees
+
+    The destination is ALWAYS a folder by default (`--dest-folder`).
+    Use `--dest-bsd` to mimick BSD/GNU default `mv` behavior
+    Use `--dest-file` to mimick BSD/GNU `mv --no-target-directory`
+
     By default it won't matter if source folders end with a path separator or not
 
         library merge-mv folder1  folder2/  # folder1 will be merged with folder2/
@@ -1248,6 +1252,18 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
 
     nb. This tool, like other library subcommands, only works on files. Empty folders will not be moved to the destination
 
+    Move files/folders without losing hierarchy metadata with --relative or relmv
+
+        Move fresh music to your phone every Sunday
+
+        # move last week music back to their source folders
+        library mv /mnt/d/sync/weekly/ /
+
+        # move new music for this week
+        library relmv (
+            library listen audio.db --local-media-only --where 'play_count=0' --random -L 600 -p f
+        ) /mnt/d/sync/weekly/
+
 
 </details>
 
@@ -1267,28 +1283,6 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
     The count of conflicts also includes trumps.
 
 
-</details>
-
-###### rel-mv
-
-<details><summary>Move files preserving parent folder hierarchy</summary>
-
-    $ library rel-mv -h
-    usage: library rel-mv [--simulate] SOURCE ... DEST
-
-    Move files/folders without losing hierarchy metadata
-
-    Move fresh music to your phone every Sunday
-
-        # move last week music back to their source folders
-        library mv /mnt/d/sync/weekly/ /mnt/d/check/audio/
-
-        # move new music for this week
-        library relmv (
-            library listen audio.db --local-media-only --where 'play_count=0' --random -L 600 -p f
-        ) /mnt/d/sync/weekly/
-
-
 </details>
 
 ###### mergerfs-cp
@@ -1298,6 +1292,9 @@ BTW, for some cols like time_deleted you'll need to specify a where clause so th
     $ library mergerfs-cp -h
     usage: library mergerfs-cp SOURCE ... DEST [--simulate] [--ext EXT]
 
+    This command mirrors the behavior of BSD with regard to destination files and folders.
+    To force the destination to always be a folder, similar to `library mv`, use `--destination-folder`
+
     Copy files with reflink and handle mergerfs mounts
 
         library mergerfs-cp --dry-run d/files* d/folder2/
@@ -2086,6 +2083,17 @@ Inspired somewhat by https://nikkhokkho.sourceforge.io/?page=FileOptimizer
         | /home/xk/github/xk/lb/__pypackages__/3.11/lib/jedi/third_party/typeshed/third_party/2and3/requests/packages/urllib3/packages/ssl_match_hostname/__init__.pyi        | 88 Bytes |
         | /home/xk/github/xk/lb/__pypackages__/3.11/lib/jedi/third_party/typeshed/third_party/2and3/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.pyi | 81 Bytes |
 
+    Group by extension
+
+        library exts du.db
+        library disk-usage du.db --group-by-extension
+        path        size    count
+        ------  --------  -------
+        avi      1.8 GiB        5
+        webm    14.3 GiB       47
+        mkv     49.2 GiB      159
+        mp4     86.7 GiB      613
+        4 file extensions
 
 
 </details>
diff --git a/tests/folders/test_merge_mv.py b/tests/folders/test_merge_mv.py
index 6156f6f2..3c8fae0f 100644
--- a/tests/folders/test_merge_mv.py
+++ b/tests/folders/test_merge_mv.py
@@ -5,10 +5,9 @@
 
 from tests.conftest import generate_file_tree_dict
 from xklb.__main__ import library as lb
-from xklb.utils import arggroups, devices, objects, path_utils
-from xklb.utils import consts
+from xklb.utils import arggroups, consts, devices, objects, path_utils
 
-TEMP_DIR = consts.TEMP_DIR.lstrip('/')
+TEMP_DIR = consts.TEMP_DIR.lstrip("/")
 
 
 @pytest.mark.parametrize("file_over_file", objects.class_enum(arggroups.FileOverFile))
@@ -165,10 +164,14 @@ def test_merge(assert_unchanged, src_type, dest_type, dest_opt, mode, temp_file_
     cmd += [src1_arg, dest_arg]
     lb(cmd)
 
+    if os.path.exists(src1):
+        src1_inodes = generate_file_tree_dict(src1, inodes=False)
+    else:
+        src1_inodes = {}
     target_inodes = generate_file_tree_dict(dest, inodes=False)
     target_inodes = objects.replace_key_in_dict(target_inodes, path_utils.basename(src1), "src1")
     target_inodes = objects.replace_key_in_dict(target_inodes, path_utils.basename(dest), "dest")
-    assert_unchanged(target_inodes)
+    assert_unchanged({"src": src1_inodes, "dest": target_inodes})
 
 
 @pytest.mark.parametrize("subcommand", ["merge-mv", "merge-cp"])
@@ -220,10 +223,10 @@ def test_simulate_mkdirs(temp_file_tree):
 
     assert generate_file_tree_dict(src1) == src1_inodes
     assert generate_file_tree_dict(dest) == {
-        'folder1': {
-            'file4.txt': {},
+        "folder1": {
+            "file4.txt": {},
         },
-        'folder2': {},
+        "folder2": {},
     }
 
 
@@ -252,10 +255,10 @@ def test_filter_file(temp_file_tree):
 @pytest.mark.parametrize("subcommand", ["merge-mv", "merge-cp"])
 def test_same_file(subcommand, temp_file_tree):
     src1 = temp_file_tree({"file4.txt": "4"}) + os.sep + "file4.txt"
-    src1_inodes = generate_file_tree_dict(src1, inodes=subcommand=='merge-mv')
+    src1_inodes = generate_file_tree_dict(src1, inodes=subcommand == "merge-mv")
 
     lb([subcommand, src1, src1])
-    assert generate_file_tree_dict(src1, inodes=subcommand=='merge-mv') == src1_inodes
+    assert generate_file_tree_dict(src1, inodes=subcommand == "merge-mv") == src1_inodes
 
 
 @pytest.mark.parametrize("subcommand", ["merge-mv", "merge-cp"])
@@ -267,25 +270,6 @@ def test_same_folder(subcommand, temp_file_tree):
     assert generate_file_tree_dict(src1) == src1_inodes
 
 
-@pytest.mark.parametrize("src", ['FILE', 'FOLDER'])
-@pytest.mark.parametrize("use_parent", [True, False])
-@pytest.mark.parametrize(
-    "relative_to", [':', '/', os.sep, 'TEMP_DIR', 'SRC_FILE', 'SRC_FOLDER', 'SRC_PARENT', 'TARGET']
-)
-def test_relmv(temp_file_tree, src, use_parent, relative_to):
-    src1, src1_inodes, target = relmv_run(temp_file_tree, src, use_parent, relative_to)
-
-    expected_results = {Path(TEMP_DIR).name: {Path(src1).name: src1_inodes}}
-    if relative_to in (':','TEMP_DIR'):
-        expected_results = {Path(src1).name: src1_inodes}
-    if relative_to in ('SRC_FOLDER',):
-        expected_results = src1_inodes
-    if src == 'FILE' and  relative_to == 'SRC_FILE':
-        expected_results = {Path(target).name: src1_inodes['file4.txt']}
-
-    assert generate_file_tree_dict(target) == expected_results
-
-
 def relmv_run(temp_file_tree, src, use_parent, relative_to):
     file_tree = {"file4.txt": "4"}
     src1 = temp_file_tree(file_tree)
@@ -300,18 +284,18 @@ def relmv_run(temp_file_tree, src, use_parent, relative_to):
         command += ["--parent"]
 
     command += ["--relative-to"]
-    if relative_to == 'TEMP_DIR':
+    if relative_to == "TEMP_DIR":
         command += [consts.TEMP_DIR]
-    elif relative_to == 'SRC_FILE':
+    elif relative_to == "SRC_FILE":
         command += [src1_file]
-    elif relative_to == 'SRC_FOLDER':
+    elif relative_to == "SRC_FOLDER":
         command += [src1]
-    elif relative_to == 'TARGET':
+    elif relative_to == "TARGET":
         command += [target]
     else:
         command += [relative_to]
 
-    if src == 'FILE':
+    if src == "FILE":
         command += [src1_file]
     else:
         command += [src1]
@@ -319,3 +303,22 @@ def relmv_run(temp_file_tree, src, use_parent, relative_to):
     command += [target]
     lb(command)
     return src1, src1_inodes, target
+
+
+@pytest.mark.parametrize("src", ["FILE", "FOLDER"])
+@pytest.mark.parametrize("use_parent", [True, False])
+@pytest.mark.parametrize(
+    "relative_to", [":", "/", os.sep, "TEMP_DIR", "SRC_FILE", "SRC_FOLDER", "SRC_PARENT", "TARGET"]
+)
+def test_relmv(temp_file_tree, src, use_parent, relative_to):
+    src1, src1_inodes, target = relmv_run(temp_file_tree, src, use_parent, relative_to)
+
+    expected_results = {Path(TEMP_DIR).name: {Path(src1).name: src1_inodes}}
+    if relative_to in (":", "TEMP_DIR"):
+        expected_results = {Path(src1).name: src1_inodes}
+    if relative_to in ("SRC_FOLDER",):
+        expected_results = src1_inodes
+    if src == "FILE" and relative_to == "SRC_FILE":
+        expected_results = {Path(target).name: src1_inodes["file4.txt"]}
+
+    assert generate_file_tree_dict(target) == expected_results
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=bsd].yml"
index a344f93d..8f7e4003 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=bsd].yml"	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=file].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=folder].yml"
index 731d586a..05f071a6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=folder].yml"	
@@ -1,10 +1,23 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  file4_1.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '4'
+    file4_1.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -17,15 +30,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=parent].yml"
index 05f073ad..c156560b 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_file src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml"
index 17433772..3439562e 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml"	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=file].yml"
index f3749ae2..7dec6fa1 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=folder].yml"
index c60f118c..59002322 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=folder].yml"	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=parent].yml"
index 4a26d666..f43a6e81 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=clobber_folder src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=bsd].yml"
index 04688876..8537fbd2 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=bsd].yml"	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=file].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=folder].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=folder].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=parent].yml"
index ce9eecac..e1972452 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=folder_merge src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=bsd].yml"
index c147023d..acba64d1 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=bsd].yml"	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=file].yml"
index 4cb31273..bf803eda 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=file].yml"	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=folder].yml"
index c1537ebe..488a97ae 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=folder].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=not_exist].yml"
index 0967ef42..d6badd18 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=not_exist].yml"	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=parent].yml"
index 91dc56e1..85e69d56 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=bsd dest_type=not_exist src_type=parent].yml"	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=bsd].yml"
index a344f93d..8f7e4003 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=bsd].yml"	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=file].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=folder].yml"
index 731d586a..05f071a6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=folder].yml"	
@@ -1,10 +1,23 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  file4_1.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '4'
+    file4_1.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -17,15 +30,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=parent].yml"
index 05f073ad..c156560b 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_file src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=bsd].yml"
index 17433772..3439562e 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=bsd].yml"	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=file].yml"
index 34ff3eff..a8172ff5 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  folder1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    folder1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=folder].yml"
index c60f118c..59002322 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=folder].yml"	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=parent].yml"
index c99693b4..bbb83f89 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=clobber_folder src_type=parent].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  src1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=bsd].yml"
index 04688876..8537fbd2 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=bsd].yml"	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=file].yml"
index 266bdbbf..10e3fec5 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=file].yml"	
@@ -1,18 +1,20 @@
 dest:
-- 0
-- '5'
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
+  dest:
   - 0
-  - '1'
+  - '5'
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=folder].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=folder].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=parent].yml"
index f5c6858e..c79f2fdc 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=folder_merge src_type=parent].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+  src1:
   - 0
-  - '3'
-src1:
-- 0
-- '5'
+  - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=bsd].yml"
index c147023d..acba64d1 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=bsd].yml"	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=file].yml"
index 5822f6d4..637e3845 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=file].yml"	
@@ -1,3 +1,5 @@
 dest:
-- 0
-- '5'
+  dest:
+  - 0
+  - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=folder].yml"
index c1537ebe..488a97ae 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=folder].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=not_exist].yml"
index 0967ef42..d6badd18 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=not_exist].yml"	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=parent].yml"
index 7f07b5d4..000ce6fc 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=file dest_type=not_exist src_type=parent].yml"	
@@ -1,3 +1,5 @@
-src1:
-- 0
-- '5'
+dest:
+  src1:
+  - 0
+  - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=bsd].yml"
index a344f93d..8f7e4003 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=bsd].yml"	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=file].yml"
index babdd8f4..f15daf8c 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=file].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  file4_1.txt:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    file4_1.txt:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=folder].yml"
index 731d586a..05f071a6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=folder].yml"	
@@ -1,10 +1,23 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  file4_1.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '4'
+    file4_1.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -17,15 +30,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=parent].yml"
index 6a1e7a1e..5e70c9b6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_file src_type=parent].yml"	
@@ -1,20 +1,22 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    - '4'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=bsd].yml"
index 17433772..3439562e 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=bsd].yml"	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=file].yml"
index f3749ae2..7dec6fa1 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=folder].yml"
index c60f118c..59002322 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=folder].yml"	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=parent].yml"
index 4a26d666..f43a6e81 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=clobber_folder src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=bsd].yml"
index 04688876..8537fbd2 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=bsd].yml"	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=file].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=file].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=folder].yml"
index 449fbb27..4ce908e6 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=folder].yml"	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-file4_1.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  file4_1.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=not_exist].yml"
index 87eb12fb..021d2117 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=not_exist].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=parent].yml"
index ce9eecac..e1972452 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=folder_merge src_type=parent].yml"	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=bsd].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=bsd].yml"
index c147023d..acba64d1 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=bsd].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=bsd].yml"	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=file].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=file].yml"
index 4cb31273..bf803eda 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=file].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=file].yml"	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=folder].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=folder].yml"
index c1537ebe..488a97ae 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=folder].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=folder].yml"	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=not_exist].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=not_exist].yml"
index 0967ef42..d6badd18 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=not_exist].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=not_exist].yml"	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=parent].yml" "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=parent].yml"
index 91dc56e1..85e69d56 100644
--- "a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=parent].yml"	
+++ "b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_\"delete_dest_hash_rename_src\" dest_opt=folder dest_type=not_exist src_type=parent].yml"	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml
index 5ce013bf..88b2980b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml
index 05f073ad..c156560b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml
index f3749ae2..7dec6fa1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml
index 4a26d666..f43a6e81 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml
index ce9eecac..e1972452 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml
index 4cb31273..bf803eda 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml
index 91dc56e1..85e69d56 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml
index 5ce013bf..88b2980b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml
index 05f073ad..c156560b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml
index 34ff3eff..a8172ff5 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  folder1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    folder1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml
index c99693b4..bbb83f89 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  src1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml
index 266bdbbf..10e3fec5 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml	
@@ -1,18 +1,20 @@
 dest:
-- 0
-- '5'
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
+  dest:
   - 0
-  - '1'
+  - '5'
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml
index f5c6858e..c79f2fdc 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+  src1:
   - 0
-  - '3'
-src1:
-- 0
-- '5'
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=file].yml
index 5822f6d4..637e3845 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
 dest:
-- 0
-- '5'
+  dest:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml
index 7f07b5d4..000ce6fc 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml	
@@ -1,3 +1,5 @@
-src1:
-- 0
-- '5'
+dest:
+  src1:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml
index 9b81e40b..fe6327f8 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml	
@@ -1,16 +1,18 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml
index 5ce013bf..88b2980b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '5'
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,4 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml
index 6a1e7a1e..5e70c9b6 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml	
@@ -1,20 +1,22 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    - '4'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml
index f3749ae2..7dec6fa1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml
index 4a26d666..f43a6e81 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml
index ce9eecac..e1972452 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml
index 4cb31273..bf803eda 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml
index 91dc56e1..85e69d56 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=file].yml
index 87eb12fb..ec210ebd 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=file].yml	
@@ -1,15 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=folder].yml
index 54466ff8..6b648b88 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
+    file4.txt:
+    - 0
+    - '4'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,7 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+src:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=parent].yml
index 05f073ad..c156560b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_file src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=file].yml
index f3749ae2..7dec6fa1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=parent].yml
index 4a26d666..f43a6e81 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=clobber_folder src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=file].yml
index 87eb12fb..ec210ebd 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=file].yml	
@@ -1,15 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=folder].yml
index 87eb12fb..c74414e9 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,32 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=parent].yml
index ce9eecac..e1972452 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=folder_merge src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=file].yml
index 4cb31273..bf803eda 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=parent].yml
index 91dc56e1..85e69d56 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=bsd dest_type=not_exist src_type=parent].yml	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=file].yml
index 87eb12fb..ec210ebd 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=file].yml	
@@ -1,15 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=folder].yml
index 54466ff8..6b648b88 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
+    file4.txt:
+    - 0
+    - '4'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,7 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+src:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=parent].yml
index 05f073ad..c156560b 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_file src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
-  - 0
-  - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
+    - 0
+    - '4'
+    src1:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=file].yml
index 34ff3eff..a8172ff5 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  folder1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    folder1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=parent].yml
index c99693b4..bbb83f89 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=clobber_folder src_type=parent].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-  src1:
-  - 0
-  - '5'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+    - 0
+    - '5'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=file].yml
index 266bdbbf..10e3fec5 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=file].yml	
@@ -1,18 +1,20 @@
 dest:
-- 0
-- '5'
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
+  dest:
   - 0
-  - '1'
+  - '5'
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=folder].yml
index 87eb12fb..c74414e9 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,32 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=parent].yml
index f5c6858e..c79f2fdc 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=folder_merge src_type=parent].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+  src1:
   - 0
-  - '3'
-src1:
-- 0
-- '5'
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=file].yml
index 5822f6d4..637e3845 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
 dest:
-- 0
-- '5'
+  dest:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=parent].yml
index 7f07b5d4..000ce6fc 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=file dest_type=not_exist src_type=parent].yml	
@@ -1,3 +1,5 @@
-src1:
-- 0
-- '5'
+dest:
+  src1:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=bsd].yml
index a344f93d..8f7e4003 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=bsd].yml	
@@ -1,32 +1,34 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-    folder1:
-      file1.txt:
-      - 0
-      - '1'
+    - '4'
+    src1:
       file4.txt:
-        file2.txt:
+      - 0
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
         - 0
-        - '2'
-    folder2:
-      .hidden:
+        - '3'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
       - 0
-      - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=file].yml
index 173bdc49..15b664e7 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=file].yml	
@@ -1,16 +1,21 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    file4.txt:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=folder].yml
index 54466ff8..6b648b88 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=folder].yml	
@@ -1,7 +1,20 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
+    file4.txt:
+    - 0
+    - '4'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder1:
     file1.txt:
     - 0
@@ -14,15 +27,7 @@ file4.txt:
     .hidden:
     - 0
     - '3'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+src:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=parent].yml
index 6a1e7a1e..5e70c9b6 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_file src_type=parent].yml	
@@ -1,20 +1,22 @@
-file4.txt:
+dest:
   file4.txt:
-  - 0
-  - '4'
-  src1:
     file4.txt:
     - 0
-    - '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
+    - '4'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=bsd].yml
index 17433772..3439562e 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=bsd].yml	
@@ -1,31 +1,33 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
-    - 0
-    - '5'
-    folder1:
-      file1.txt:
+      file2.txt:
       - 0
-      - '1'
+      - '2'
+    src1:
       file4.txt:
-        file2.txt:
-        - 0
-        - '2'
-    folder2:
-      .hidden:
       - 0
-      - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+      - '5'
+      folder1:
+        file1.txt:
+        - 0
+        - '1'
+        file4.txt:
+          file2.txt:
+          - 0
+          - '2'
+      folder2:
+        .hidden:
+        - 0
+        - '3'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=file].yml
index f3749ae2..7dec6fa1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=file].yml	
@@ -1,18 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=folder].yml
index c60f118c..59002322 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=folder].yml	
@@ -1,17 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-    file4.txt:
-    - 0
-    - '5'
+  - 0
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -20,11 +10,23 @@ folder1:
       file2.txt:
       - 0
       - '2'
+      file4.txt:
+      - 0
+      - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
   folder2:
     .hidden:
     - 0
     - '3'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=parent].yml
index 4a26d666..f43a6e81 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=clobber_folder src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-  src1:
+    - '1'
     file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+    src1:
+      file4.txt:
+      - 0
+      - '5'
+  folder2:
+    .hidden:
     - 0
-    - '5'
-folder2:
-  .hidden:
-  - 0
-  - '3'
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=bsd].yml
index 04688876..8537fbd2 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=bsd].yml	
@@ -1,22 +1,7 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
   folder1:
     file1.txt:
     - 0
@@ -29,3 +14,20 @@ src1:
     .hidden:
     - 0
     - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=file].yml
index 87eb12fb..ec210ebd 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=file].yml	
@@ -1,15 +1,20 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=folder].yml
index 87eb12fb..c74414e9 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=folder].yml	
@@ -1,15 +1,32 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
+  - 0
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
     - 0
-    - '2'
-folder2:
-  .hidden:
+    - '3'
+src:
+  file4.txt:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=not_exist].yml
index 87eb12fb..021d2117 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=not_exist].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=parent].yml
index ce9eecac..e1972452 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=folder_merge src_type=parent].yml	
@@ -1,19 +1,21 @@
-file4.txt:
-- 0
-- '4'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
-  file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
-  - 0
-  - '3'
-src1:
+dest:
   file4.txt:
   - 0
-  - '5'
+  - '4'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=bsd].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=bsd].yml
index c147023d..acba64d1 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=bsd].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=bsd].yml	
@@ -1,16 +1,18 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
-  folder1:
-    file1.txt:
-    - 0
-    - '1'
+dest:
+  src1:
     file4.txt:
-      file2.txt:
-      - 0
-      - '2'
-  folder2:
-    .hidden:
     - 0
-    - '3'
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=file].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=file].yml
index 4cb31273..bf803eda 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=file].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=file].yml	
@@ -1,3 +1,5 @@
-file4.txt:
-- 0
-- '5'
+dest:
+  file4.txt:
+  - 0
+  - '5'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=folder].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=folder].yml
index c1537ebe..488a97ae 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=folder].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=folder].yml	
@@ -1,15 +1,17 @@
-file4.txt:
-- 0
-- '5'
-folder1:
-  file1.txt:
-  - 0
-  - '1'
+dest:
   file4.txt:
-    file2.txt:
-    - 0
-    - '2'
-folder2:
-  .hidden:
   - 0
-  - '3'
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=not_exist].yml
index 0967ef42..d6badd18 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=not_exist].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=not_exist].yml	
@@ -1 +1,2 @@
-{}
+dest: {}
+src: {}
diff --git a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=parent].yml b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=parent].yml
index 91dc56e1..85e69d56 100644
--- a/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=parent].yml	
+++ b/tests/folders/test_merge_mv/test_merge[mode=file_over_file_skip dest_opt=folder dest_type=not_exist src_type=parent].yml	
@@ -1,4 +1,6 @@
-src1:
-  file4.txt:
-  - 0
-  - '5'
+dest:
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+src: {}
diff --git a/tests/folders/test_mergerfs_cp.py b/tests/folders/test_mergerfs_cp.py
index 22e0d46e..bd3f6c24 100644
--- a/tests/folders/test_mergerfs_cp.py
+++ b/tests/folders/test_mergerfs_cp.py
@@ -5,7 +5,7 @@
 
 from tests.conftest import generate_file_tree_dict
 from xklb.__main__ import library as lb
-from xklb.utils import consts
+from xklb.utils import consts, objects, path_utils
 
 simple_file_tree = {
     "folder1": {"file1.txt": "1", "file4.txt": {"file2.txt": "2"}},
@@ -27,18 +27,19 @@ def _mock_get_mergerfs_mounts(monkeypatch):
 
 @pytest.mark.parametrize("src_type", ["folder", "folder_bsd", "file", "not_exist"])
 @pytest.mark.parametrize("dest_type", ["not_exist", "folder_merge", "clobber_file", "clobber_folder"])
-def test_merge(src_type, dest_type, temp_file_tree):
-    if dest_type == "clobber_folder" and src_type != "file":
-        return  # not useful to test
-
+def test_merge(assert_unchanged, src_type, dest_type, temp_file_tree):
     if src_type == "not_exist":
         src1 = temp_file_tree({})
-    elif src_type == "file":
-        src1 = temp_file_tree({"file4.txt": "5"}) + os.sep + "file4.txt"
-    else:  # folder, folder_bsd
+    elif src_type in ("file", "parent"):
+        src1 = temp_file_tree({"file4.txt": "5"})
+    else:  # folder, bsd
         src1 = temp_file_tree(simple_file_tree | {"file4.txt": "5"})
-        if src_type == "folder":
-            src1 = src1 + os.sep
+
+    src1_arg = src1
+    if src_type in ("file", "parent"):
+        src1_arg = src1 + os.sep + "file4.txt"
+    elif src_type == "folder":
+        src1_arg = src1 + os.sep
 
     if dest_type == "not_exist":
         dest = temp_file_tree({})
@@ -52,7 +53,6 @@ def test_merge(src_type, dest_type, temp_file_tree):
         dest_arg = os.path.join(dest, "folder1")
 
     src1_inodes = generate_file_tree_dict(src1, inodes=False)
-    dest_inodes = generate_file_tree_dict(dest, inodes=False)
 
     cmd = ["mergerfs-cp"]
     cmd += ["--file-over-file", "delete-dest"]
@@ -60,44 +60,15 @@ def test_merge(src_type, dest_type, temp_file_tree):
         cmd += ["--bsd"]
     if dest_type == "clobber_file":
         cmd += ["--dest-file"]
-    cmd += [src1, dest_arg]
+    cmd += [src1_arg, dest_arg]
     lb(cmd)
 
     assert generate_file_tree_dict(src1, inodes=False) == src1_inodes
 
     target_inodes = generate_file_tree_dict(dest, inodes=False)
-    if src_type == "not_exist":
-        assert target_inodes == dest_inodes
-    elif src_type == "folder_bsd" and dest_type == "not_exist":
-        assert target_inodes == {Path(src1).name: src1_inodes}
-    elif dest_type in ("not_exist",):
-        assert target_inodes == src1_inodes
-
-    elif src_type == "folder_bsd" and dest_type == "folder_merge":
-        assert target_inodes == dest_inodes | {Path(src1).name: src1_inodes}
-
-    elif src_type == "folder_bsd" and dest_type == "clobber_file":
-        assert target_inodes == dest_inodes | {'file4.txt': {Path(src1).name: src1_inodes, 'file4.txt': dest_inodes['file4.txt']}}
-
-    elif dest_type == "folder_merge":
-        assert target_inodes == dest_inodes | src1_inodes
-
-    elif dest_type == "clobber_folder":
-        dest_inodes['folder1']["file4.txt"] = src1_inodes | dest_inodes['folder1']["file4.txt"]  # type: ignore
-        assert target_inodes == dest_inodes
-
-    elif src_type in "file" and dest_type == "clobber_file":
-        assert target_inodes == dest_inodes | src1_inodes
-
-    elif src_type in "folder" and dest_type == "clobber_file":
-        dest_inodes["file4.txt"] = src1_inodes  # type: ignore
-        assert target_inodes == dest_inodes
-
-    elif dest_type == "clobber_file":
-        assert target_inodes == dest_inodes
-
-    else:
-        raise NotImplementedError
+    target_inodes = objects.replace_key_in_dict(target_inodes, path_utils.basename(src1), "src1")
+    target_inodes = objects.replace_key_in_dict(target_inodes, path_utils.basename(dest), "dest")
+    assert_unchanged(target_inodes)
 
 
 def test_dupe_replace(temp_file_tree):
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=file].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=file].yml
new file mode 100644
index 00000000..c1537ebe
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=file].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '5'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder].yml
new file mode 100644
index 00000000..5ce013bf
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder].yml	
@@ -0,0 +1,28 @@
+file4.txt:
+  file4.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder_bsd].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder_bsd].yml
new file mode 100644
index 00000000..a344f93d
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=folder_bsd].yml	
@@ -0,0 +1,32 @@
+file4.txt:
+  file4.txt:
+  - 0
+  - '4'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=not_exist].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=not_exist].yml
new file mode 100644
index 00000000..87eb12fb
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_file src_type=not_exist].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=file].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=file].yml
new file mode 100644
index 00000000..f3749ae2
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=file].yml	
@@ -0,0 +1,18 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+    file4.txt:
+    - 0
+    - '5'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder].yml
new file mode 100644
index 00000000..c60f118c
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder].yml	
@@ -0,0 +1,30 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+    file4.txt:
+    - 0
+    - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder_bsd].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder_bsd].yml
new file mode 100644
index 00000000..17433772
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=folder_bsd].yml	
@@ -0,0 +1,31 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+  src1:
+    file4.txt:
+    - 0
+    - '5'
+    folder1:
+      file1.txt:
+      - 0
+      - '1'
+      file4.txt:
+        file2.txt:
+        - 0
+        - '2'
+    folder2:
+      .hidden:
+      - 0
+      - '3'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=not_exist].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=not_exist].yml
new file mode 100644
index 00000000..87eb12fb
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=clobber_folder src_type=not_exist].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=file].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=file].yml
new file mode 100644
index 00000000..c1537ebe
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=file].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '5'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder].yml
new file mode 100644
index 00000000..c1537ebe
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '5'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder_bsd].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder_bsd].yml
new file mode 100644
index 00000000..04688876
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=folder_bsd].yml	
@@ -0,0 +1,31 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
+src1:
+  file4.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=not_exist].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=not_exist].yml
new file mode 100644
index 00000000..87eb12fb
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=folder_merge src_type=not_exist].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '4'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=file].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=file].yml
new file mode 100644
index 00000000..4cb31273
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=file].yml	
@@ -0,0 +1,3 @@
+file4.txt:
+- 0
+- '5'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder].yml
new file mode 100644
index 00000000..c1537ebe
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder].yml	
@@ -0,0 +1,15 @@
+file4.txt:
+- 0
+- '5'
+folder1:
+  file1.txt:
+  - 0
+  - '1'
+  file4.txt:
+    file2.txt:
+    - 0
+    - '2'
+folder2:
+  .hidden:
+  - 0
+  - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder_bsd].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder_bsd].yml
new file mode 100644
index 00000000..c147023d
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=folder_bsd].yml	
@@ -0,0 +1,16 @@
+src1:
+  file4.txt:
+  - 0
+  - '5'
+  folder1:
+    file1.txt:
+    - 0
+    - '1'
+    file4.txt:
+      file2.txt:
+      - 0
+      - '2'
+  folder2:
+    .hidden:
+    - 0
+    - '3'
diff --git a/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=not_exist].yml b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=not_exist].yml
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/tests/folders/test_mergerfs_cp/test_merge[dest_type=not_exist src_type=not_exist].yml	
@@ -0,0 +1 @@
+{}
diff --git a/tests/folders/test_rel_mv.py b/tests/folders/test_rel_mv.py
index 28965706..2639778a 100644
--- a/tests/folders/test_rel_mv.py
+++ b/tests/folders/test_rel_mv.py
@@ -2,14 +2,13 @@
 from pathlib import Path
 
 import pytest
-from pyfakefs.fake_filesystem import OSType
 
 from tests.conftest import generate_file_tree_dict
 from xklb.__main__ import library as lb
 from xklb.folders.merge_mv import gen_rel_path
 from xklb.utils import consts
 
-TEMP_DIR = consts.TEMP_DIR.lstrip('/')
+TEMP_DIR = consts.TEMP_DIR.lstrip("/")
 
 simple_file_tree = {
     "folder1": {"file1.txt": "1", "subfolder1": {"file2.txt": "2"}},
@@ -38,7 +37,10 @@ def test_two_simple_folders_root(temp_file_tree):
     target = temp_file_tree({})
     lb(["rel-mv", src1, src2, target])
 
-    assert generate_file_tree_dict(target) == {TEMP_DIR: {Path(src1).name: src1_inodes} | {Path(src2).name: src2_inodes}}
+    assert generate_file_tree_dict(target) == {
+        TEMP_DIR: {Path(src1).name: src1_inodes} | {Path(src2).name: src2_inodes}
+    }
+
 
 def test_two_simple_folders_commonpath(temp_file_tree):
     src1 = temp_file_tree(simple_file_tree)
@@ -61,9 +63,8 @@ def test_dupe_delete_same(temp_file_tree):
     lb(["rel-mv", "--relative-to=:", "--file-over-file=delete-src-hash skip", src1, target])
 
     assert generate_file_tree_dict(target) == target_inodes
-    assert generate_file_tree_dict(src1) == {
-        "file4.txt": src1_inodes["file4.txt"]
-    }
+    assert generate_file_tree_dict(src1) == {"file4.txt": src1_inodes["file4.txt"]}
+
 
 def test_dupe_skip(temp_file_tree):
     src1 = temp_file_tree(simple_file_tree | {"file4.txt": "5"})
@@ -127,7 +128,7 @@ def test_gen_rel_path(test_dirs):
     source = source_dir / "file.txt"
     source.touch()
 
-    result = gen_rel_path(source, dest_dir, ':')
+    result = gen_rel_path(source, dest_dir, ":")
     expected = os.path.join(dest_dir, "source", "file.txt")
     assert result == expected
 
@@ -138,8 +139,8 @@ def test_gen_rel_path_from_subdir(test_dirs):
     source.parent.mkdir(exist_ok=True)
     source.touch()
 
-    result = gen_rel_path(source, dest_dir, ':')
-    expected = os.path.join(dest_dir, "source","subdir","file.txt")
+    result = gen_rel_path(source, dest_dir, ":")
+    expected = os.path.join(dest_dir, "source", "subdir", "file.txt")
     assert result == expected
 
 
@@ -164,5 +165,5 @@ def test_gen_rel_path_relative_deep(test_dirs):
     source.touch()
 
     result = gen_rel_path(source, dest_dir, relative_to=relative_to)
-    expected = os.path.join(dest_dir, "t2","t3","file.txt")
+    expected = os.path.join(dest_dir, "t2", "t3", "file.txt")
     assert result == expected
diff --git a/xklb/__main__.py b/xklb/__main__.py
index 420be739..0cb871a7 100644
--- a/xklb/__main__.py
+++ b/xklb/__main__.py
@@ -5,7 +5,7 @@
 from xklb.utils import argparse_utils, iterables
 from xklb.utils.log_utils import log
 
-__version__ = "2.9.066"
+__version__ = "2.9.067"
 
 progs = {
     "Create database subcommands": {
diff --git a/xklb/createdb/fs_add_metadata.py b/xklb/createdb/fs_add_metadata.py
index cb3cc886..ff05ef99 100644
--- a/xklb/createdb/fs_add_metadata.py
+++ b/xklb/createdb/fs_add_metadata.py
@@ -106,7 +106,7 @@ def extract_metadata(mp_args, path) -> dict[str, str | int | None] | None:
         media["hash"] = sample_hash.sample_hash_file(path)
 
     if getattr(mp_args, "copy", False) and not file_utils.is_file_open(path):
-        dest_path = merge_mv.gen_rel_path(path, mp_args.copy, ':')
+        dest_path = merge_mv.gen_rel_path(path, mp_args.copy, ":")
         if getattr(mp_args, "clean_path", True):
             dest_path = path_utils.clean_path(bytes(dest_path))
         else:
@@ -115,7 +115,7 @@ def extract_metadata(mp_args, path) -> dict[str, str | int | None] | None:
         path = media["path"] = dest_path
 
     if getattr(mp_args, "move", False) and not file_utils.is_file_open(path):
-        dest_path = merge_mv.gen_rel_path(path, mp_args.move, ':')
+        dest_path = merge_mv.gen_rel_path(path, mp_args.move, ":")
         if getattr(mp_args, "clean_path", True):
             dest_path = path_utils.clean_path(bytes(dest_path))
         else:
diff --git a/xklb/folders/merge_mv.py b/xklb/folders/merge_mv.py
index 71191523..521a8c17 100644
--- a/xklb/folders/merge_mv.py
+++ b/xklb/folders/merge_mv.py
@@ -2,18 +2,7 @@
 from pathlib import Path
 
 from xklb import usage
-from xklb.utils import (
-    arggroups,
-    argparse_utils,
-    devices,
-    file_utils,
-    nums,
-    path_utils,
-    printing,
-    processes,
-    sql_utils,
-    strings,
-)
+from xklb.utils import arggroups, argparse_utils, devices, file_utils, path_utils, printing, processes, strings
 from xklb.utils.log_utils import log
 
 
@@ -91,7 +80,7 @@ def mmv_file(args, source, destination):
         print("-->", destination)
     else:
         file_utils.rename_move_file(source, destination)
-        log.debug('moved %s\t%s', source, destination)
+        log.debug("moved %s\t%s", source, destination)
 
 
 @track_moved
@@ -101,7 +90,7 @@ def mcp_file(args, source, destination):
         print("==>", destination)
     else:
         out = shutil.copy2(source, destination)
-        log.debug('copied %s\t%s', source, out)
+        log.debug("copied %s\t%s", source, out)
 
 
 def filter_src(args, path):
@@ -132,13 +121,13 @@ def gen_rel_path(source, dest, relative_to):
 
     try:
         relpath = str(abspath.relative_to(rel))
-        log.debug('abspath %s relative to %s = %s', abspath, rel, relpath)
+        log.debug("abspath %s relative to %s = %s", abspath, rel, relpath)
     except ValueError:
-        relpath = str(abspath.relative_to('/'))
-        log.debug('ValueError using abspath %s', relpath)
+        relpath = str(abspath.relative_to("/"))
+        log.debug("ValueError using abspath %s", relpath)
 
     source_destination = str(Path(dest) / relpath)
-    log.debug('source destination %s', source_destination)
+    log.debug("source destination %s", source_destination)
 
     return source_destination
 
@@ -155,7 +144,7 @@ def gen_src_dest(args, sources, destination, shortcut_allowed=False):
             if not args.relative_to:
                 if args.parent or (args.bsd and not source.endswith(os.sep)):  # use BSD behavior
                     folder_dest = os.path.join(folder_dest, path_utils.basename(source))
-                    log.debug('folder parent %s', folder_dest)
+                    log.debug("folder parent %s", folder_dest)
 
             # if no conflict, use shortcut
             if all(
@@ -168,59 +157,58 @@ def gen_src_dest(args, sources, destination, shortcut_allowed=False):
                     not os.path.exists(folder_dest),
                 ]
             ):
-                log.debug('taking shortcut')
+                log.debug("taking shortcut")
                 try:
                     parent = os.path.dirname(folder_dest)
                     if not os.path.exists(parent):
-                        log.debug('taking shortcut: making dirs')
+                        log.debug("taking shortcut: making dirs")
                         os.makedirs(parent)
                     os.rename(source, folder_dest)
                 except OSError:
-                    log.debug('taking shortcut: failed')
-                    pass
+                    log.debug("taking shortcut: failed")
                 else:
-                    log.debug('taking shortcut: success')
+                    log.debug("taking shortcut: success")
                     continue
             # merge source folder with conflict folder/file
             for p in file_utils.rglob_gen(source, args.ext or None):
                 if filter_src(args, p) is False:
-                    log.debug('rglob-file skipped %s', p)
+                    log.debug("rglob-file skipped %s", p)
                     continue
 
                 relpath = os.path.relpath(p, source)
-                log.debug('rglob-file relpath %s', relpath)
+                log.debug("rglob-file relpath %s", relpath)
                 if args.modify_depth:
                     rel_p = Path(relpath)
                     parts = rel_p.parent.parts[args.modify_depth]
                     relpath = os.path.join(*parts, rel_p.name)
-                    log.debug('rglob-file modify_depth %s %s', parts, relpath)
+                    log.debug("rglob-file modify_depth %s %s", parts, relpath)
 
                 file_dest = os.path.join(folder_dest, relpath)
-                log.debug('rglob-file file_dest %s', file_dest)
+                log.debug("rglob-file file_dest %s", file_dest)
 
                 src, dest = devices.clobber(args, p, file_dest)
                 if src:
                     yield src, dest
         else:  # source is a file
             if filter_src(args, source) is False:
-                log.debug('rglob-file skipped %s', source)
+                log.debug("rglob-file skipped %s", source)
                 continue
 
             file_dest = source_destination
             if not args.relative_to:
                 if args.parent:
                     file_dest = os.path.join(file_dest, path_utils.parent(source))
-                    log.debug('file parent %s', file_dest)
+                    log.debug("file parent %s", file_dest)
 
                 if args.dest_file:
                     append_basename = False
                 elif args.dest_folder:
                     append_basename = True
                 else:  # args.dest_bsd
-                    append_basename = (destination.endswith(os.sep) or os.path.isdir(destination))
+                    append_basename = destination.endswith(os.sep) or os.path.isdir(destination)
                 if append_basename:
                     file_dest = os.path.join(file_dest, path_utils.basename(source))
-                    log.debug('file append basename %s', file_dest)
+                    log.debug("file append basename %s", file_dest)
 
             src, dest = devices.clobber(args, source, file_dest)
             if src:
diff --git a/xklb/fsdb/disk_usage.py b/xklb/fsdb/disk_usage.py
index 75fb8ffb..eb6018ff 100644
--- a/xklb/fsdb/disk_usage.py
+++ b/xklb/fsdb/disk_usage.py
@@ -1,4 +1,4 @@
-import argparse, os
+import os
 
 from xklb import usage
 from xklb.playback import media_printer
diff --git a/xklb/mediafiles/process_media.py b/xklb/mediafiles/process_media.py
index 45f83613..2460a2a9 100644
--- a/xklb/mediafiles/process_media.py
+++ b/xklb/mediafiles/process_media.py
@@ -297,7 +297,7 @@ def process_media() -> None:
                 if new_path is None:
                     m["time_deleted"] = consts.APPLICATION_START
 
-                    new_free_space += (m.get("compressed_size") or m["size"])
+                    new_free_space += m.get("compressed_size") or m["size"]
                 else:
                     m["new_path"] = str(new_path)
                     m["new_size"] = os.stat(new_path).st_size
diff --git a/xklb/utils/arggroups.py b/xklb/utils/arggroups.py
index cf663d7f..d081badf 100644
--- a/xklb/utils/arggroups.py
+++ b/xklb/utils/arggroups.py
@@ -661,36 +661,49 @@ def mmv_folders(parent_parser):
 -S+5GB -S-7GB  # between 5 and 7 GB""",
     )
     parser.add_argument("--limit", "-n", "-l", "-L", type=int, help="Limit number of files transferred")
+    parser.add_argument("--relative", "--rel", action="store_true", help="Shortcut: --relative-to=/")
     parser.add_argument(
-        "--relative", "--rel", action='store_true', help="Shortcut: --relative-to=/"
-    )
-    parser.add_argument(
-        "--relative-to", "--relative-from", help="""Preserve directory hierarchy
+        "--relative-to",
+        "--relative-from",
+        help="""Preserve directory hierarchy
 library relmv /src/d1/ /mnt/d1/ /mnt/dest/
 /src/d1/          /mnt/d1/           /mnt/dest
 /mnt/dest/        /mnt/dest/         (without --relative or --relative-to)
 /mnt/dest/src/d1/ /mnt/dest/mnt/d1/  --relative-to=/ (all directory hierarchy)
 /mnt/dest/src/d1/ /mnt/dest/d1/      --relative-to=: (exclude commonpath)
-/mnt/dest/src/d1/ /mnt/dest/         --relative-to=/mnt/d1"""
+/mnt/dest/src/d1/ /mnt/dest/         --relative-to=/mnt/d1""",
     )
     parser.add_argument("--bsd", "--rsync", action="store_true", help="BSD/rsync trailing slash behavior")
     parser.add_argument("--parent", action="store_true", help="Include parent (dirname) when merging")
 
     group = parser.add_mutually_exclusive_group()
     group.add_argument("--dest-bsd", "--bsd-dest", "--dest", action="store_true", help="Destination-is-a-dest mode")
-    group.add_argument("--dest-file", "--destination-file", "--no-target-directory", action="store_true", help="Destination-is-a-file mode")
-    group.add_argument("--dest-folder", "--destination-folder", "--target-directory", action="store_true", help="Destination-is-a-folder mode")
+    group.add_argument(
+        "--dest-file",
+        "--destination-file",
+        "--no-target-directory",
+        action="store_true",
+        help="Destination-is-a-file mode",
+    )
+    group.add_argument(
+        "--dest-folder",
+        "--destination-folder",
+        "--target-directory",
+        action="store_true",
+        help="Destination-is-a-folder mode",
+    )
+
 
 def mmv_folders_post(args):
     if args.sizes:
         args.sizes = sql_utils.parse_human_to_lambda(nums.human_to_bytes, args.sizes)
 
-    if args.relative_to and args.relative_to.startswith(':'):
+    if args.relative_to and args.relative_to.startswith(":"):
         pass
     elif args.relative_to:
         args.relative_to = str(Path(args.relative_to).expanduser().resolve())
     elif args.relative:
-        args.relative_to = '/'
+        args.relative_to = "/"
 
 
 def playback(parent_parser):
@@ -1297,6 +1310,7 @@ def clobber(parent_parser):
         "--skip-open", action="store_true", help="Skip source files that are already open in another process"
     )
 
+
 def process_ffmpeg(parent_parser):
     parser = parent_parser.add_argument_group("FFMPEG Processing")
     parser.add_argument(
diff --git a/xklb/utils/devices.py b/xklb/utils/devices.py
index 378ff655..234d8694 100644
--- a/xklb/utils/devices.py
+++ b/xklb/utils/devices.py
@@ -252,7 +252,7 @@ def clobber(args, source, destination) -> tuple[str | None, str]:
                         # file was a conflict with destination path but let the caller rename it
                         return temp_rename, parent_file
                     rename(args, temp_rename, parent_file)  # temporary rename to final dest
-                    if destination == parent_file:  # TODO: falsify
+                    if destination == parent_file:
                         log.info("re-targeted %s -> %s", orig_destination, destination)
                         return clobber(args, source, destination)
 
diff --git a/xklb/utils/objects.py b/xklb/utils/objects.py
index 06c014bb..df39f279 100644
--- a/xklb/utils/objects.py
+++ b/xklb/utils/objects.py
@@ -216,6 +216,7 @@ def __eq__(self, other):
     def __repr__(self):
         return f"Reverse({self.obj})"
 
+
 def replace_key_in_dict(d, old_key, new_key):
     if isinstance(d, dict):
         new_dict = {}
diff --git a/xklb/utils/path_utils.py b/xklb/utils/path_utils.py
index 8befab19..c808ddbd 100644
--- a/xklb/utils/path_utils.py
+++ b/xklb/utils/path_utils.py
@@ -132,6 +132,7 @@ def bfs_removedirs(root_dir):
         except OSError:
             pass
 
+
 def parent(s):
     return os.path.basename(os.path.dirname(s))
 
@@ -147,5 +148,5 @@ def basename(path):
     ''
     """
     path = os.fspath(path)
-    sep = os.path.sep + (os.path.altsep or '')
+    sep = os.path.sep + (os.path.altsep or "")
     return os.path.basename(path.rstrip(sep))