diff --git a/services/web/app/src/Features/Authentication/AuthenticationController.js b/services/web/app/src/Features/Authentication/AuthenticationController.mjs
similarity index 100%
rename from services/web/app/src/Features/Authentication/AuthenticationController.js
rename to services/web/app/src/Features/Authentication/AuthenticationController.mjs
diff --git a/services/web/app/src/Features/Authorization/AuthorizationManager.js b/services/web/app/src/Features/Authorization/AuthorizationManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Authorization/AuthorizationManager.js
rename to services/web/app/src/Features/Authorization/AuthorizationManager.mjs
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsGetter.js b/services/web/app/src/Features/Collaborators/CollaboratorsGetter.mjs
similarity index 100%
rename from services/web/app/src/Features/Collaborators/CollaboratorsGetter.js
rename to services/web/app/src/Features/Collaborators/CollaboratorsGetter.mjs
diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsHandler.js b/services/web/app/src/Features/Collaborators/CollaboratorsHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Collaborators/CollaboratorsHandler.js
rename to services/web/app/src/Features/Collaborators/CollaboratorsHandler.mjs
diff --git a/services/web/app/src/Features/Compile/ClsiCacheManager.js b/services/web/app/src/Features/Compile/ClsiCacheManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Compile/ClsiCacheManager.js
rename to services/web/app/src/Features/Compile/ClsiCacheManager.mjs
diff --git a/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js b/services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.js
rename to services/web/app/src/Features/DocumentUpdater/DocumentUpdaterHandler.mjs
diff --git a/services/web/app/src/Features/Editor/EditorController.js b/services/web/app/src/Features/Editor/EditorController.mjs
similarity index 100%
rename from services/web/app/src/Features/Editor/EditorController.js
rename to services/web/app/src/Features/Editor/EditorController.mjs
diff --git a/services/web/app/src/Features/FileStore/FileStoreHandler.js b/services/web/app/src/Features/FileStore/FileStoreHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/FileStore/FileStoreHandler.js
rename to services/web/app/src/Features/FileStore/FileStoreHandler.mjs
diff --git a/services/web/app/src/Features/Helpers/AdminAuthorizationHelper.js b/services/web/app/src/Features/Helpers/AdminAuthorizationHelper.mjs
similarity index 100%
rename from services/web/app/src/Features/Helpers/AdminAuthorizationHelper.js
rename to services/web/app/src/Features/Helpers/AdminAuthorizationHelper.mjs
diff --git a/services/web/app/src/Features/History/HistoryManager.js b/services/web/app/src/Features/History/HistoryManager.mjs
similarity index 100%
rename from services/web/app/src/Features/History/HistoryManager.js
rename to services/web/app/src/Features/History/HistoryManager.mjs
diff --git a/services/web/app/src/Features/Project/ProjectCreationHandler.js b/services/web/app/src/Features/Project/ProjectCreationHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectCreationHandler.js
rename to services/web/app/src/Features/Project/ProjectCreationHandler.mjs
diff --git a/services/web/app/src/Features/Project/ProjectDeleter.js b/services/web/app/src/Features/Project/ProjectDeleter.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectDeleter.js
rename to services/web/app/src/Features/Project/ProjectDeleter.mjs
diff --git a/services/web/app/src/Features/Project/ProjectDetailsHandler.js b/services/web/app/src/Features/Project/ProjectDetailsHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectDetailsHandler.js
rename to services/web/app/src/Features/Project/ProjectDetailsHandler.mjs
diff --git a/services/web/app/src/Features/Project/ProjectEntityHandler.js b/services/web/app/src/Features/Project/ProjectEntityHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectEntityHandler.js
rename to services/web/app/src/Features/Project/ProjectEntityHandler.mjs
diff --git a/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
rename to services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.mjs
diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
rename to services/web/app/src/Features/Project/ProjectEntityUpdateHandler.mjs
diff --git a/services/web/app/src/Features/Project/ProjectGetter.js b/services/web/app/src/Features/Project/ProjectGetter.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectGetter.js
rename to services/web/app/src/Features/Project/ProjectGetter.mjs
diff --git a/services/web/app/src/Features/Project/ProjectLocator.js b/services/web/app/src/Features/Project/ProjectLocator.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectLocator.js
rename to services/web/app/src/Features/Project/ProjectLocator.mjs
diff --git a/services/web/app/src/Features/Project/ProjectRootDocManager.js b/services/web/app/src/Features/Project/ProjectRootDocManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Project/ProjectRootDocManager.js
rename to services/web/app/src/Features/Project/ProjectRootDocManager.mjs
diff --git a/services/web/app/src/Features/Subscription/LimitationsManager.js b/services/web/app/src/Features/Subscription/LimitationsManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Subscription/LimitationsManager.js
rename to services/web/app/src/Features/Subscription/LimitationsManager.mjs
diff --git a/services/web/app/src/Features/Subscription/SubscriptionHandler.js b/services/web/app/src/Features/Subscription/SubscriptionHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Subscription/SubscriptionHandler.js
rename to services/web/app/src/Features/Subscription/SubscriptionHandler.mjs
diff --git a/services/web/app/src/Features/Subscription/TeamInvitesHandler.js b/services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/Subscription/TeamInvitesHandler.js
rename to services/web/app/src/Features/Subscription/TeamInvitesHandler.mjs
diff --git a/services/web/app/src/Features/Templates/TemplatesManager.js b/services/web/app/src/Features/Templates/TemplatesManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Templates/TemplatesManager.js
rename to services/web/app/src/Features/Templates/TemplatesManager.mjs
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.mjs
similarity index 100%
rename from services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.js
rename to services/web/app/src/Features/ThirdPartyDataStore/TpdsProjectFlusher.mjs
diff --git a/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js b/services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.mjs
similarity index 100%
rename from services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.js
rename to services/web/app/src/Features/ThirdPartyDataStore/TpdsUpdateSender.mjs
diff --git a/services/web/app/src/Features/Uploads/FileSystemImportManager.js b/services/web/app/src/Features/Uploads/FileSystemImportManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Uploads/FileSystemImportManager.js
rename to services/web/app/src/Features/Uploads/FileSystemImportManager.mjs
diff --git a/services/web/app/src/Features/Uploads/ProjectUploadManager.js b/services/web/app/src/Features/Uploads/ProjectUploadManager.mjs
similarity index 100%
rename from services/web/app/src/Features/Uploads/ProjectUploadManager.js
rename to services/web/app/src/Features/Uploads/ProjectUploadManager.mjs
diff --git a/services/web/app/src/Features/User/UserDeleter.js b/services/web/app/src/Features/User/UserDeleter.mjs
similarity index 100%
rename from services/web/app/src/Features/User/UserDeleter.js
rename to services/web/app/src/Features/User/UserDeleter.mjs
diff --git a/services/web/app/src/Features/User/UserHandler.js b/services/web/app/src/Features/User/UserHandler.mjs
similarity index 100%
rename from services/web/app/src/Features/User/UserHandler.js
rename to services/web/app/src/Features/User/UserHandler.mjs
diff --git a/services/web/test/unit/src/Authentication/AuthenticationControllerTests.js b/services/web/test/unit/src/Authentication/AuthenticationController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Authentication/AuthenticationControllerTests.js
rename to services/web/test/unit/src/Authentication/AuthenticationController.test.mjs
diff --git a/services/web/test/unit/src/Authorization/AuthorizationManagerTests.js b/services/web/test/unit/src/Authorization/AuthorizationManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Authorization/AuthorizationManagerTests.js
rename to services/web/test/unit/src/Authorization/AuthorizationManager.test.mjs
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsGetter.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Collaborators/CollaboratorsGetterTests.js
rename to services/web/test/unit/src/Collaborators/CollaboratorsGetter.test.mjs
diff --git a/services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js b/services/web/test/unit/src/Collaborators/CollaboratorsHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Collaborators/CollaboratorsHandlerTests.js
rename to services/web/test/unit/src/Collaborators/CollaboratorsHandler.test.mjs
diff --git a/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandlerTests.js b/services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandlerTests.js
rename to services/web/test/unit/src/DocumentUpdater/DocumentUpdaterHandler.test.mjs
diff --git a/services/web/test/unit/src/Editor/EditorControllerTests.js b/services/web/test/unit/src/Editor/EditorController.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Editor/EditorControllerTests.js
rename to services/web/test/unit/src/Editor/EditorController.test.mjs
diff --git a/services/web/test/unit/src/FileStore/FileStoreHandlerTests.js b/services/web/test/unit/src/FileStore/FileStoreHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/FileStore/FileStoreHandlerTests.js
rename to services/web/test/unit/src/FileStore/FileStoreHandler.test.mjs
diff --git a/services/web/test/unit/src/HelperFiles/AdminAuthorizationHelperTests.js b/services/web/test/unit/src/HelperFiles/AdminAuthorizationHelper.test.mjs
similarity index 100%
rename from services/web/test/unit/src/HelperFiles/AdminAuthorizationHelperTests.js
rename to services/web/test/unit/src/HelperFiles/AdminAuthorizationHelper.test.mjs
diff --git a/services/web/test/unit/src/History/HistoryManagerTests.js b/services/web/test/unit/src/History/HistoryManagerTests.mjs
similarity index 100%
rename from services/web/test/unit/src/History/HistoryManagerTests.js
rename to services/web/test/unit/src/History/HistoryManagerTests.mjs
diff --git a/services/web/test/unit/src/Project/ProjectDeleterTests.js b/services/web/test/unit/src/Project/ProjectDeleter.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectDeleterTests.js
rename to services/web/test/unit/src/Project/ProjectDeleter.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js b/services/web/test/unit/src/Project/ProjectDetailsHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectDetailsHandlerTests.js
rename to services/web/test/unit/src/Project/ProjectDetailsHandler.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectEntityHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectEntityHandlerTests.js
rename to services/web/test/unit/src/Project/ProjectEntityHandler.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js
rename to services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandler.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityUpdateHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js
rename to services/web/test/unit/src/Project/ProjectEntityUpdateHandler.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectGetterTests.js b/services/web/test/unit/src/Project/ProjectGetter.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectGetterTests.js
rename to services/web/test/unit/src/Project/ProjectGetter.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectLocatorTests.js b/services/web/test/unit/src/Project/ProjectLocator.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectLocatorTests.js
rename to services/web/test/unit/src/Project/ProjectLocator.test.mjs
diff --git a/services/web/test/unit/src/Project/ProjectRootDocManagerTests.js b/services/web/test/unit/src/Project/ProjectRootDocManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Project/ProjectRootDocManagerTests.js
rename to services/web/test/unit/src/Project/ProjectRootDocManager.test.mjs
diff --git a/services/web/test/unit/src/Subscription/LimitationsManagerTests.js b/services/web/test/unit/src/Subscription/LimitationsManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Subscription/LimitationsManagerTests.js
rename to services/web/test/unit/src/Subscription/LimitationsManager.test.mjs
diff --git a/services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js b/services/web/test/unit/src/Subscription/SubscriptionHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js
rename to services/web/test/unit/src/Subscription/SubscriptionHandler.test.mjs
diff --git a/services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js b/services/web/test/unit/src/Subscription/TeamInvitesHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Subscription/TeamInvitesHandlerTests.js
rename to services/web/test/unit/src/Subscription/TeamInvitesHandler.test.mjs
diff --git a/services/web/test/unit/src/Templates/TemplatesManagerTests.js b/services/web/test/unit/src/Templates/TemplatesManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Templates/TemplatesManagerTests.js
rename to services/web/test/unit/src/Templates/TemplatesManager.test.mjs
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsProjectFlusherTests.js b/services/web/test/unit/src/ThirdPartyDataStore/TpdsProjectFlusher.test.mjs
similarity index 100%
rename from services/web/test/unit/src/ThirdPartyDataStore/TpdsProjectFlusherTests.js
rename to services/web/test/unit/src/ThirdPartyDataStore/TpdsProjectFlusher.test.mjs
diff --git a/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js b/services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSender.test.mjs
similarity index 100%
rename from services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSenderTests.js
rename to services/web/test/unit/src/ThirdPartyDataStore/TpdsUpdateSender.test.mjs
diff --git a/services/web/test/unit/src/Uploads/FileSystemImportManagerTests.js b/services/web/test/unit/src/Uploads/FileSystemImportManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Uploads/FileSystemImportManagerTests.js
rename to services/web/test/unit/src/Uploads/FileSystemImportManager.test.mjs
diff --git a/services/web/test/unit/src/Uploads/ProjectUploadManagerTests.js b/services/web/test/unit/src/Uploads/ProjectUploadManager.test.mjs
similarity index 100%
rename from services/web/test/unit/src/Uploads/ProjectUploadManagerTests.js
rename to services/web/test/unit/src/Uploads/ProjectUploadManager.test.mjs
diff --git a/services/web/test/unit/src/User/UserDeleterTests.js b/services/web/test/unit/src/User/UserDeleter.test.mjs
similarity index 100%
rename from services/web/test/unit/src/User/UserDeleterTests.js
rename to services/web/test/unit/src/User/UserDeleter.test.mjs
diff --git a/services/web/test/unit/src/User/UserHandlerTests.js b/services/web/test/unit/src/User/UserHandler.test.mjs
similarity index 100%
rename from services/web/test/unit/src/User/UserHandlerTests.js
rename to services/web/test/unit/src/User/UserHandler.test.mjs