diff --git a/src/utils/BookmarksCorePluginSignature.spec.ts b/src/test/unit/BookmarksCorePluginSignature.spec.ts
similarity index 99%
rename from src/utils/BookmarksCorePluginSignature.spec.ts
rename to src/test/unit/BookmarksCorePluginSignature.spec.ts
index 4250725..b81d068 100644
--- a/src/utils/BookmarksCorePluginSignature.spec.ts
+++ b/src/test/unit/BookmarksCorePluginSignature.spec.ts
@@ -2,8 +2,8 @@ import {
     _unitTests,
     BookmarkedParentFolder,
     OrderedBookmarks
-} from "./BookmarksCorePluginSignature";
-import {extractParentFolderPath} from "./utils";
+} from "../../utils/BookmarksCorePluginSignature";
+import {extractParentFolderPath} from "../../utils/utils";
 
 type Bookmarks_PluginInstance = any
 
diff --git a/src/custom-sort/custom-sort-getComparator.spec.ts b/src/test/unit/custom-sort-getComparator.spec.ts
similarity index 98%
rename from src/custom-sort/custom-sort-getComparator.spec.ts
rename to src/test/unit/custom-sort-getComparator.spec.ts
index 342acc7..902efc9 100644
--- a/src/custom-sort/custom-sort-getComparator.spec.ts
+++ b/src/test/unit/custom-sort-getComparator.spec.ts
@@ -4,9 +4,9 @@ import {
 	OS_byCreatedTime,
 	OS_byModifiedTime,
 	OS_byModifiedTimeReverse, SortingLevelId
-} from './custom-sort';
-import * as CustomSortModule from './custom-sort';
-import {CustomSortGroupType, CustomSortOrder, CustomSortSpec} from './custom-sort-types';
+} from '../../custom-sort/custom-sort';
+import * as CustomSortModule from '../../custom-sort/custom-sort';
+import {CustomSortGroupType, CustomSortOrder, CustomSortSpec} from '../../custom-sort/custom-sort-types';
 
 const MOCK_TIMESTAMP: number = 1656417542418
 
diff --git a/src/custom-sort/custom-sort-utils.spec.ts b/src/test/unit/custom-sort-utils.spec.ts
similarity index 97%
rename from src/custom-sort/custom-sort-utils.spec.ts
rename to src/test/unit/custom-sort-utils.spec.ts
index 4c55453..43e3e47 100644
--- a/src/custom-sort/custom-sort-utils.spec.ts
+++ b/src/test/unit/custom-sort-utils.spec.ts
@@ -2,14 +2,14 @@ import {
     CustomSortGroupType,
     CustomSortOrder,
     CustomSortSpec
-} from "./custom-sort-types";
+} from "../../custom-sort/custom-sort-types";
 import {
     collectSortingAndGroupingTypes,
     hasOnlyByBookmarkOrStandardObsidian,
     HasSortingOrGrouping,
     ImplicitSortspecForBookmarksIntegration
-} from "./custom-sort-utils";
-import {SortingSpecProcessor, SortSpecsCollection} from "./sorting-spec-processor";
+} from "../../custom-sort/custom-sort-utils";
+import {SortingSpecProcessor, SortSpecsCollection} from "../../custom-sort/sorting-spec-processor";
 
 type NM = number
 
diff --git a/src/custom-sort/custom-sort.spec.ts b/src/test/unit/custom-sort.spec.ts
similarity index 99%
rename from src/custom-sort/custom-sort.spec.ts
rename to src/test/unit/custom-sort.spec.ts
index 5b4cb5c..87c89b4 100644
--- a/src/custom-sort/custom-sort.spec.ts
+++ b/src/test/unit/custom-sort.spec.ts
@@ -21,28 +21,28 @@ import {
 	sorterByFolderMDate,
 	sorterByMetadataField,
 	SorterFn
-} from './custom-sort';
+} from '../../custom-sort/custom-sort';
 import {
 	_unitTests
-} from './custom-sort'
+} from '../../custom-sort/custom-sort'
 import {
 	CustomSortGroupType,
 	CustomSortOrder,
 	CustomSortSpec,
 	RegExpSpec
-} from './custom-sort-types';
+} from '../../custom-sort/custom-sort-types';
 import {
 	CompoundDashNumberNormalizerFn,
 	CompoundDotRomanNumberNormalizerFn
-} from "./sorting-spec-processor";
+} from "../../custom-sort/sorting-spec-processor";
 import {
 	findStarredFile_pathParam,
 	Starred_PluginInstance
-} from "../utils/StarredPluginSignature";
+} from "../../utils/StarredPluginSignature";
 import {
 	ObsidianIconFolder_PluginInstance,
 	ObsidianIconFolderPlugin_Data
-} from "../utils/ObsidianIconFolderPluginSignature";
+} from "../../utils/ObsidianIconFolderPluginSignature";
 
 const mockTFile = (basename: string, ext: string, size?: number, ctime?: number, mtime?: number): TFile => {
 	return {
diff --git a/src/custom-sort/folder-matching-rules.spec.ts b/src/test/unit/folder-matching-rules.spec.ts
similarity index 99%
rename from src/custom-sort/folder-matching-rules.spec.ts
rename to src/test/unit/folder-matching-rules.spec.ts
index 1cabf1f..46fc261 100644
--- a/src/custom-sort/folder-matching-rules.spec.ts
+++ b/src/test/unit/folder-matching-rules.spec.ts
@@ -1,6 +1,6 @@
 import {
 	FolderWildcardMatching
-} from './folder-matching-rules'
+} from '../../custom-sort/folder-matching-rules'
 
 type SortingSpec = string
 
diff --git a/src/custom-sort/macros.spec.ts b/src/test/unit/macros.spec.ts
similarity index 97%
rename from src/custom-sort/macros.spec.ts
rename to src/test/unit/macros.spec.ts
index 3011360..c33f758 100644
--- a/src/custom-sort/macros.spec.ts
+++ b/src/test/unit/macros.spec.ts
@@ -1,12 +1,12 @@
 import {
     expandMacros,
     expandMacrosInString
-} from "./macros";
-import * as MacrosModule from './macros'
+} from "../../custom-sort/macros";
+import * as MacrosModule from '../../custom-sort/macros'
 import {
     CustomSortGroup,
     CustomSortSpec
-} from "./custom-sort-types";
+} from "../../custom-sort/custom-sort-types";
 
 describe('expandMacrosInString', () => {
     it.each([
diff --git a/src/custom-sort/matchers.spec.ts b/src/test/unit/matchers.spec.ts
similarity index 99%
rename from src/custom-sort/matchers.spec.ts
rename to src/test/unit/matchers.spec.ts
index aef520e..12f825f 100644
--- a/src/custom-sort/matchers.spec.ts
+++ b/src/test/unit/matchers.spec.ts
@@ -11,7 +11,7 @@ import {
 	CompoundRomanNumberDashRegexStr,
 	WordInASCIIRegexStr,
 	WordInAnyLanguageRegexStr
-} from "./matchers";
+} from "../../custom-sort/matchers";
 
 describe('Plain numbers regexp', () => {
 	let regexp: RegExp;
diff --git a/src/custom-sort/sorting-spec-processor.spec.ts b/src/test/unit/sorting-spec-processor.spec.ts
similarity index 99%
rename from src/custom-sort/sorting-spec-processor.spec.ts
rename to src/test/unit/sorting-spec-processor.spec.ts
index 2d7913e..b68d0ee 100644
--- a/src/custom-sort/sorting-spec-processor.spec.ts
+++ b/src/test/unit/sorting-spec-processor.spec.ts
@@ -13,9 +13,9 @@ import {
 	RegexpUsedAs,
 	RomanNumberNormalizerFn,
 	SortingSpecProcessor
-} from "./sorting-spec-processor"
-import {CustomSortGroupType, CustomSortOrder, CustomSortSpec, IdentityNormalizerFn} from "./custom-sort-types";
-import {FolderMatchingRegexp, FolderMatchingTreeNode} from "./folder-matching-rules";
+} from "../../custom-sort/sorting-spec-processor"
+import {CustomSortGroupType, CustomSortOrder, CustomSortSpec, IdentityNormalizerFn} from "../../custom-sort/custom-sort-types";
+import {FolderMatchingRegexp, FolderMatchingTreeNode} from "../../custom-sort/folder-matching-rules";
 
 const txtInputExampleA: string = `
 order-asc: a-z
diff --git a/src/utils/utils.spec.ts b/src/test/unit/utils.spec.ts
similarity index 97%
rename from src/utils/utils.spec.ts
rename to src/test/unit/utils.spec.ts
index eeb8eb5..d03ba24 100644
--- a/src/utils/utils.spec.ts
+++ b/src/test/unit/utils.spec.ts
@@ -1,7 +1,7 @@
 import {
     lastPathComponent,
     extractParentFolderPath
-} from "./utils";
+} from "../../utils/utils";
 
 describe('lastPathComponent and extractParentFolderPath', () => {
     it.each([