diff --git a/test/normal/object/end-extending/paragraph/cmd b/test/normal/object/end-extending/paragraph/single/cmd
similarity index 100%
rename from test/normal/object/end-extending/paragraph/cmd
rename to test/normal/object/end-extending/paragraph/single/cmd
diff --git a/test/normal/object/end-extending/paragraph/in b/test/normal/object/end-extending/paragraph/single/in
similarity index 100%
rename from test/normal/object/end-extending/paragraph/in
rename to test/normal/object/end-extending/paragraph/single/in
diff --git a/test/normal/object/end-extending/paragraph/kak_quoted_selections b/test/normal/object/end-extending/paragraph/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/end-extending/paragraph/kak_quoted_selections
rename to test/normal/object/end-extending/paragraph/single/kak_quoted_selections
diff --git a/test/normal/object/end-extending/sentence/cmd b/test/normal/object/end-extending/sentence/single/cmd
similarity index 100%
rename from test/normal/object/end-extending/sentence/cmd
rename to test/normal/object/end-extending/sentence/single/cmd
diff --git a/test/normal/object/end-extending/sentence/in b/test/normal/object/end-extending/sentence/single/in
similarity index 100%
rename from test/normal/object/end-extending/sentence/in
rename to test/normal/object/end-extending/sentence/single/in
diff --git a/test/normal/object/end-extending/sentence/kak_quoted_selections b/test/normal/object/end-extending/sentence/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/end-extending/sentence/kak_quoted_selections
rename to test/normal/object/end-extending/sentence/single/kak_quoted_selections
diff --git a/test/normal/object/end/paragraph/cmd b/test/normal/object/end/paragraph/single/cmd
similarity index 100%
rename from test/normal/object/end/paragraph/cmd
rename to test/normal/object/end/paragraph/single/cmd
diff --git a/test/normal/object/end/paragraph/in b/test/normal/object/end/paragraph/single/in
similarity index 100%
rename from test/normal/object/end/paragraph/in
rename to test/normal/object/end/paragraph/single/in
diff --git a/test/normal/object/end/paragraph/kak_quoted_selections b/test/normal/object/end/paragraph/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/end/paragraph/kak_quoted_selections
rename to test/normal/object/end/paragraph/single/kak_quoted_selections
diff --git a/test/normal/object/end/sentence/cmd b/test/normal/object/end/sentence/single/cmd
similarity index 100%
rename from test/normal/object/end/sentence/cmd
rename to test/normal/object/end/sentence/single/cmd
diff --git a/test/normal/object/end/sentence/in b/test/normal/object/end/sentence/single/in
similarity index 100%
rename from test/normal/object/end/sentence/in
rename to test/normal/object/end/sentence/single/in
diff --git a/test/normal/object/end/sentence/kak_quoted_selections b/test/normal/object/end/sentence/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/end/sentence/kak_quoted_selections
rename to test/normal/object/end/sentence/single/kak_quoted_selections
diff --git a/test/normal/object/start-extending/paragraph/cmd b/test/normal/object/start-extending/paragraph/single/cmd
similarity index 100%
rename from test/normal/object/start-extending/paragraph/cmd
rename to test/normal/object/start-extending/paragraph/single/cmd
diff --git a/test/normal/object/start-extending/paragraph/in b/test/normal/object/start-extending/paragraph/single/in
similarity index 100%
rename from test/normal/object/start-extending/paragraph/in
rename to test/normal/object/start-extending/paragraph/single/in
diff --git a/test/normal/object/start-extending/paragraph/kak_quoted_selections b/test/normal/object/start-extending/paragraph/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/start-extending/paragraph/kak_quoted_selections
rename to test/normal/object/start-extending/paragraph/single/kak_quoted_selections
diff --git a/test/normal/object/start-extending/sentence/cmd b/test/normal/object/start-extending/sentence/single/cmd
similarity index 100%
rename from test/normal/object/start-extending/sentence/cmd
rename to test/normal/object/start-extending/sentence/single/cmd
diff --git a/test/normal/object/start-extending/sentence/in b/test/normal/object/start-extending/sentence/single/in
similarity index 100%
rename from test/normal/object/start-extending/sentence/in
rename to test/normal/object/start-extending/sentence/single/in
diff --git a/test/normal/object/start-extending/sentence/kak_quoted_selections b/test/normal/object/start-extending/sentence/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/start-extending/sentence/kak_quoted_selections
rename to test/normal/object/start-extending/sentence/single/kak_quoted_selections
diff --git a/test/normal/object/start/paragraph/cmd b/test/normal/object/start/paragraph/single/cmd
similarity index 100%
rename from test/normal/object/start/paragraph/cmd
rename to test/normal/object/start/paragraph/single/cmd
diff --git a/test/normal/object/start/paragraph/in b/test/normal/object/start/paragraph/single/in
similarity index 100%
rename from test/normal/object/start/paragraph/in
rename to test/normal/object/start/paragraph/single/in
diff --git a/test/normal/object/start/paragraph/kak_quoted_selections b/test/normal/object/start/paragraph/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/start/paragraph/kak_quoted_selections
rename to test/normal/object/start/paragraph/single/kak_quoted_selections
diff --git a/test/normal/object/start/sentence/cmd b/test/normal/object/start/sentence/single/cmd
similarity index 100%
rename from test/normal/object/start/sentence/cmd
rename to test/normal/object/start/sentence/single/cmd
diff --git a/test/normal/object/start/sentence/in b/test/normal/object/start/sentence/single/in
similarity index 100%
rename from test/normal/object/start/sentence/in
rename to test/normal/object/start/sentence/single/in
diff --git a/test/normal/object/start/sentence/kak_quoted_selections b/test/normal/object/start/sentence/single/kak_quoted_selections
similarity index 100%
rename from test/normal/object/start/sentence/kak_quoted_selections
rename to test/normal/object/start/sentence/single/kak_quoted_selections