diff --git a/.github/workflows/deploy_images.yml b/.github/workflows/deploy_images.yml
index 93eed90ed4..9235d4ac19 100644
--- a/.github/workflows/deploy_images.yml
+++ b/.github/workflows/deploy_images.yml
@@ -21,7 +21,7 @@ jobs:
       - name: checkout save-core
         uses: actions/checkout@v3
         with:
-          repository: analysis-dev/save
+          repository: saveourtool/save
           path: save
           fetch-depth: 0
           submodules: true
diff --git a/.run/save-backend not docker.run.xml b/.run/save-backend not docker.run.xml
index 4cd9d70cac..db839ca4ec 100644
--- a/.run/save-backend not docker.run.xml	
+++ b/.run/save-backend not docker.run.xml	
@@ -3,7 +3,7 @@
     <envs>
       <env name="SPRING_PROFILES_ACTIVE" value="dev" />
     </envs>
-    <option name="MAIN_CLASS_NAME" value="org.cqfn.save.backend.SaveApplicationKt" />
+    <option name="MAIN_CLASS_NAME" value="com.saveourtool.save.backend.SaveApplicationKt" />
     <module name="save-cloud.save-backend.main" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/LICENSE b/LICENSE
index 268dcbe15c..815122625d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 CQFN
+Copyright (c) 2022 SaveOurTool
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 65d9c386b5..80a926b41f 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-![Build and test](https://github.com/analysis-dev/save-cloud/workflows/Build%20and%20test/badge.svg)
-[![License](https://img.shields.io/github/license/analysis-dev/save-cloud)](https://github.com/analysis-dev/save-cloud/blob/master/LICENSE)
-[![codecov](https://codecov.io/gh/analysis-dev/save-cloud/branch/master/graph/badge.svg)](https://codecov.io/gh/analysis-dev/save-cloud)
+![Build and test](https://github.com/saveourtool/save-cloud/workflows/Build%20and%20test/badge.svg)
+[![License](https://img.shields.io/github/license/saveourtool/save-cloud)](https://github.com/saveourtool/save-cloud/blob/master/LICENSE)
+[![codecov](https://codecov.io/gh/saveourtool/save-cloud/branch/master/graph/badge.svg)](https://codecov.io/gh/saveourtool/save-cloud)
 
 ## What is SAVE?
-[SAVE](https://github.com/analysis-dev/save) (Software Analysis Verification & Evaluation) - is an eco-system for measuring, testing and certification of software tools. Instead of writing your test framework SAVE will provide you a command line application
+[SAVE](https://github.com/saveourtool/save) (Software Analysis Verification & Evaluation) - is an eco-system for measuring, testing and certification of software tools. Instead of writing your test framework SAVE will provide you a command line application
 and with a test sets for the language that you are developing analyzer/compiler/or any other dev-tool for. 
 It provides you also a cloud service that can be used to determine the readiness of your tool. SAVE has a committee of software analysis and system programming experts
 that regularly update tests and discuss the best practices for particular programming languages.
diff --git a/api-gateway/build.gradle.kts b/api-gateway/build.gradle.kts
index 7b8496862b..ecebf3618c 100644
--- a/api-gateway/build.gradle.kts
+++ b/api-gateway/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.cqfn.save.buildutils.configureJacoco
-import org.cqfn.save.buildutils.configureSpringBoot
+import com.saveourtool.save.buildutils.configureJacoco
+import com.saveourtool.save.buildutils.configureSpringBoot
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/SaveGateway.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/SaveGateway.kt
similarity index 81%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/SaveGateway.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/SaveGateway.kt
index c096c812e5..ea3bbd4d98 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/SaveGateway.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/SaveGateway.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.gateway
+package com.saveourtool.save.gateway
 
-import org.cqfn.save.gateway.config.ConfigurationProperties
+import com.saveourtool.save.gateway.config.ConfigurationProperties
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/config/ConfigurationProperties.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/config/ConfigurationProperties.kt
similarity index 96%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/config/ConfigurationProperties.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/config/ConfigurationProperties.kt
index d5d1048f1e..4bf655464c 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/config/ConfigurationProperties.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/config/ConfigurationProperties.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.gateway.config
+package com.saveourtool.save.gateway.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/controller/SecurityInfoController.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/controller/SecurityInfoController.kt
similarity index 87%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/controller/SecurityInfoController.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/controller/SecurityInfoController.kt
index 41321f5c3d..c5854bde5d 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/controller/SecurityInfoController.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/controller/SecurityInfoController.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.gateway.controller
+package com.saveourtool.save.gateway.controller
 
-import org.cqfn.save.gateway.utils.userName
-import org.cqfn.save.info.OauthProviderInfo
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.gateway.utils.userName
+import com.saveourtool.save.info.OauthProviderInfo
+import com.saveourtool.save.info.UserInfo
 import org.slf4j.LoggerFactory
 import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository
 import org.springframework.web.bind.annotation.*
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/security/WebSecurityConfig.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/security/WebSecurityConfig.kt
similarity index 96%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/security/WebSecurityConfig.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/security/WebSecurityConfig.kt
index 0ce077d340..c333606ac1 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/security/WebSecurityConfig.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/security/WebSecurityConfig.kt
@@ -2,12 +2,12 @@
  * Configuration beans for security in different profiles
  */
 
-package org.cqfn.save.gateway.security
+package com.saveourtool.save.gateway.security
 
-import org.cqfn.save.gateway.config.ConfigurationProperties
-import org.cqfn.save.gateway.utils.StoringServerAuthenticationSuccessHandler
-import org.cqfn.save.utils.IdentitySourceAwareUserDetails
-import org.cqfn.save.utils.IdentitySourceAwareUserDetailsMixin
+import com.saveourtool.save.gateway.config.ConfigurationProperties
+import com.saveourtool.save.gateway.utils.StoringServerAuthenticationSuccessHandler
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetails
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetailsMixin
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.context.annotation.Bean
@@ -113,7 +113,7 @@ class WebSecurityConfig(
                 .authenticated()
         }
         .and().run {
-            // FixMe: Properly support CSRF protection https://github.com/analysis-dev/save-cloud/issues/34
+            // FixMe: Properly support CSRF protection https://github.com/saveourtool/save-cloud/issues/34
             csrf().disable()
         }
         .exceptionHandling {
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/AuthUtils.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/AuthUtils.kt
similarity index 96%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/AuthUtils.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/AuthUtils.kt
index 8d094594d0..62716f984e 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/AuthUtils.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/AuthUtils.kt
@@ -2,7 +2,7 @@
  * Utility methods to work with authentication-related objects
  */
 
-package org.cqfn.save.gateway.utils
+package com.saveourtool.save.gateway.utils
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt
similarity index 98%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt
index 6e25d674a5..6c887c5d99 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/ConvertAuthorizationHeaderGatewayFilterFactory.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.gateway.utils
+package com.saveourtool.save.gateway.utils
 
 import org.springframework.cloud.gateway.filter.GatewayFilter
 import org.springframework.cloud.gateway.filter.GatewayFilterChain
diff --git a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
similarity index 90%
rename from api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
rename to api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
index 58c60ade96..3553b32289 100644
--- a/api-gateway/src/main/kotlin/org/cqfn/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
+++ b/api-gateway/src/main/kotlin/com/saveourtool/save/gateway/utils/StoringServerAuthenticationSuccessHandler.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.gateway.utils
+package com.saveourtool.save.gateway.utils
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.User
-import org.cqfn.save.gateway.config.ConfigurationProperties
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.gateway.config.ConfigurationProperties
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.slf4j.LoggerFactory
@@ -36,7 +36,7 @@ class StoringServerAuthenticationSuccessHandler(
         logger.info("Authenticated user ${authentication.userName()} with authentication type ${authentication::class}, will send data to backend")
 
         val user = authentication.toUser().apply {
-            // https://github.com/analysis-dev/save-cloud/issues/583
+            // https://github.com/saveourtool/save-cloud/issues/583
             // fixme: this sets a default role for a new user with minimal scope, however this way we discard existing role
             // from authentication provider. In the future we may want to use this information and have a mapping of existing
             // roles to save-cloud roles.
diff --git a/build.gradle.kts b/build.gradle.kts
index 497b22e1d2..cd9026d473 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,13 +1,13 @@
-import org.cqfn.save.buildutils.configureDetekt
-import org.cqfn.save.buildutils.configureDiktat
-import org.cqfn.save.buildutils.configureVersioning
-import org.cqfn.save.buildutils.createDetektTask
-import org.cqfn.save.buildutils.createStackDeployTask
-import org.cqfn.save.buildutils.getDatabaseCredentials
-import org.cqfn.save.buildutils.installGitHooks
-import org.cqfn.save.buildutils.registerSaveCliVersionCheckTask
+import com.saveourtool.save.buildutils.configureDetekt
+import com.saveourtool.save.buildutils.configureDiktat
+import com.saveourtool.save.buildutils.configureVersioning
+import com.saveourtool.save.buildutils.createDetektTask
+import com.saveourtool.save.buildutils.createStackDeployTask
+import com.saveourtool.save.buildutils.getDatabaseCredentials
+import com.saveourtool.save.buildutils.installGitHooks
+import com.saveourtool.save.buildutils.registerSaveCliVersionCheckTask
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.cqfn.save.buildutils.configurePublishing
+import com.saveourtool.save.buildutils.configurePublishing
 
 plugins {
     alias(libs.plugins.talaiot.base)
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DatabaseUtils.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DatabaseUtils.kt
similarity index 98%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DatabaseUtils.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DatabaseUtils.kt
index 5d3e2c65e5..79a22d7194 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DatabaseUtils.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DatabaseUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.gradle.api.Project
 import java.io.File
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DetektConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DetektConfiguration.kt
similarity index 95%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DetektConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DetektConfiguration.kt
index ea40e06e7c..e5b99c9531 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DetektConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DetektConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration for detekt static analysis
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektPlugin
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DiktatConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DiktatConfiguration.kt
similarity index 93%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DiktatConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DiktatConfiguration.kt
index 2643cd6e34..ce13ca931a 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DiktatConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DiktatConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration for diktat static analysis
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.cqfn.diktat.plugin.gradle.DiktatExtension
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin
@@ -40,7 +40,7 @@ private fun Project.fixDiktatTasks() {
         javaLauncher.set(project.extensions.getByType<JavaToolchainService>().launcherFor {
             languageVersion.set(JavaLanguageVersion.of(Versions.jdk))
         })
-        // https://github.com/analysis-dev/diktat/issues/1269
+        // https://github.com/saveourtool/diktat/issues/1269
         systemProperty("user.home", rootDir.toString())
     }
 }
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DockerStackConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DockerStackConfiguration.kt
similarity index 99%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DockerStackConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DockerStackConfiguration.kt
index 499d03d46e..fc96ca40d7 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DockerStackConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DockerStackConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration for docker swarm deployment
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.Exec
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/GitHookInstallation.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/GitHookInstallation.kt
similarity index 94%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/GitHookInstallation.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/GitHookInstallation.kt
index 94a15b764b..36e8e72f09 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/GitHookInstallation.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/GitHookInstallation.kt
@@ -2,7 +2,7 @@
  * Gradle tasks to install git hooks as a part of the build
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.Copy
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/JacocoConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/JacocoConfiguration.kt
similarity index 95%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/JacocoConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/JacocoConfiguration.kt
index 276b34cfa8..da96417936 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/JacocoConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/JacocoConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration for code coverage calculation via Jacoco
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/PublishingConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/PublishingConfiguration.kt
similarity index 93%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/PublishingConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/PublishingConfiguration.kt
index e4055bc571..b9f4aa54b7 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/PublishingConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/PublishingConfiguration.kt
@@ -2,7 +2,7 @@
  * Publishing configuration file.
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import io.github.gradlenexus.publishplugin.NexusPublishExtension
 import io.github.gradlenexus.publishplugin.NexusPublishPlugin
@@ -74,7 +74,7 @@ private fun Project.configurePublications() {
             publication.pom {
                 name.set(project.name)
                 description.set(project.description ?: project.name)
-                url.set("https://github.com/cqfn/save-cloud")
+                url.set("https://github.com/saveourtool/save-cloud")
                 licenses {
                     license {
                         name.set("MIT License")
@@ -95,8 +95,8 @@ private fun Project.configurePublications() {
                     }
                 }
                 scm {
-                    url.set("https://github.com/cqfn/save-cloud")
-                    connection.set("scm:git:git://github.com/cqfn/save-cloud.git")
+                    url.set("https://github.com/saveourtool/save-cloud")
+                    connection.set("scm:git:git://github.com/saveourtool/save-cloud.git")
                 }
             }
         }
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/SpringBootConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/SpringBootConfiguration.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/SpringBootConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/SpringBootConfiguration.kt
index e2b802af67..3bc8be1dff 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/SpringBootConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/SpringBootConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration utilities for spring boot projects
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.accessors.dm.LibrariesForLibs
@@ -93,7 +93,7 @@ fun Project.configureSpringBoot(withSpringDataJpa: Boolean = false) {
     }
 
     tasks.named<BootBuildImage>("bootBuildImage") {
-        imageName = "ghcr.io/analysis-dev/${project.name}:${project.versionForDockerImages()}"
+        imageName = "ghcr.io/saveourtool/${project.name}:${project.versionForDockerImages()}"
         environment = mapOf(
             "BP_JVM_VERSION" to Versions.jdk,
             "BPE_DELIM_JAVA_TOOL_OPTIONS" to " ",
@@ -106,7 +106,7 @@ fun Project.configureSpringBoot(withSpringDataJpa: Boolean = false) {
         if (isPublish) {
             docker {
                 publishRegistry {
-                    username = "analysis-dev"
+                    username = "saveourtool"
                     password = registryPassword
                     url = "https://ghcr.io"
                 }
diff --git a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/VersioningConfiguration.kt b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/VersioningConfiguration.kt
similarity index 96%
rename from buildSrc/src/main/kotlin/org/cqfn/save/buildutils/VersioningConfiguration.kt
rename to buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/VersioningConfiguration.kt
index 4339d59d4b..0a42d94533 100644
--- a/buildSrc/src/main/kotlin/org/cqfn/save/buildutils/VersioningConfiguration.kt
+++ b/buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/VersioningConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration for project versioning
  */
 
-package org.cqfn.save.buildutils
+package com.saveourtool.save.buildutils
 
 import org.ajoberstar.grgit.gradle.GrgitServiceExtension
 import org.ajoberstar.grgit.gradle.GrgitServicePlugin
@@ -78,7 +78,7 @@ fun Project.registerSaveCliVersionCheckTask() {
                 findProperty("saveCliVersion") as String? ?: run {
                     // as fallback, use latest release to allow the project to build successfully
                     val latestRelease = ResourceGroovyMethods.getText(
-                        URL("https://api.github.com/repos/analysis-dev/save/releases/latest")
+                        URL("https://api.github.com/repos/saveourtool/save-cli/releases/latest")
                     )
                     (groovy.json.JsonSlurper().parseText(latestRelease) as Map<String, Any>)["tag_name"].let {
                         (it as String).trim('v')
diff --git a/db/v-1/insert-test-data/git-insert.xml b/db/v-1/insert-test-data/git-insert.xml
index 524d9b32c9..42b67e0b53 100644
--- a/db/v-1/insert-test-data/git-insert.xml
+++ b/db/v-1/insert-test-data/git-insert.xml
@@ -16,7 +16,7 @@
 
         <insert dbms="mysql" tableName="git">
             <column name="id" value="2" />
-            <column name="url" value="https://github.com/analysis-dev/save-cloud" />
+            <column name="url" value="https://github.com/saveourtool/save-cloud" />
             <column name="username" value="kentr0w" />
             <column name="password" value="pass" />
             <column name="branch" value="feature/create-backend" />
diff --git a/diktat-analysis.yml b/diktat-analysis.yml
index df80c06031..456a3f4f8f 100644
--- a/diktat-analysis.yml
+++ b/diktat-analysis.yml
@@ -1,7 +1,7 @@
 - name: DIKTAT_COMMON
   enabled: true
   configuration:
-    domainName: org.cqfn.save
+    domainName: com.saveourtool.save
     kotlinVersion: 1.5
     srcDirectories: "main,nativeMain,linuxX64Main"
     testDirs: "test,nativeTest,linuxX64Test"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 926b7e30a3..1b0f2be463 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,7 +17,7 @@ x-logging:
 
 services:
   orchestrator:
-    image: ghcr.io/analysis-dev/save-orchestrator:${TAG}
+    image: ghcr.io/saveourtool/save-orchestrator:${TAG}
     user: root  # to access host's docker socket
     environment:
       - "SPRING_PROFILES_ACTIVE=${PROFILE}"
@@ -35,7 +35,7 @@ services:
         - "prometheus-job=save-orchestrator"
     logging: *loki-logging-jvm
   backend:
-    image: ghcr.io/analysis-dev/save-backend:${TAG}
+    image: ghcr.io/saveourtool/save-backend:${TAG}
     environment:
       - "SPRING_PROFILES_ACTIVE=${PROFILE},secure,docker-secrets"
       - "MYSQL_USER=/run/secrets/db_username"
@@ -54,7 +54,7 @@ services:
         - "prometheus-job=save-backend"
     logging: *loki-logging-jvm
   preprocessor:
-    image: ghcr.io/analysis-dev/save-preprocessor:${TAG}
+    image: ghcr.io/saveourtool/save-preprocessor:${TAG}
     environment:
       - "SPRING_PROFILES_ACTIVE=${PROFILE}"
     volumes:
@@ -72,7 +72,7 @@ services:
         max_attempts: 3
     logging: *loki-logging-jvm
   gateway:
-    image: ghcr.io/analysis-dev/api-gateway:${TAG}
+    image: ghcr.io/saveourtool/api-gateway:${TAG}
     environment:
       - "SPRING_PROFILES_ACTIVE=${PROFILE}"
     ports:
diff --git a/gradle.properties b/gradle.properties
index 3fc6244fe3..dfa38b0deb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-group=org.cqfn.save
+group=com.saveourtool.save
 liquibaseTaskPrefix=liquibase
 # gradle performance
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 054bdf3b44..dea6982085 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -45,21 +45,21 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
 kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-plugin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" }
 kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
-diktat = { id = "org.cqfn.diktat.diktat-gradle-plugin", version.ref = "diktat" }
+diktat = { id = "com.cqfn.diktat.diktat-gradle-plugin", version.ref = "diktat" }
 liquibase-gradle = { id = "org.liquibase.gradle", version = "2.1.1" }
 talaiot-base = { id = "com.cdsap.talaiot.plugin.base", version = "1.4.2" }
 download = { id = "de.undercouch.download", version = "5.1.0" }
 
 [libraries]
-save-common = { module = "org.cqfn.save:save-common", version.ref = "save-core" }
-save-common-jvm = { module = "org.cqfn.save:save-common-jvm", version.ref = "save-core" }
-save-core = { module = "org.cqfn.save:save-core", version.ref = "save-core" }
-save-core-jvm = { module = "org.cqfn.save:save-core-jvm", version.ref = "save-core" }
-save-plugins-fix = { module = "org.cqfn.save:fix-plugin", version.ref = "save-core" }
-save-plugins-fix-jvm = { module = "org.cqfn.save:fix-plugin-jvm", version.ref = "save-core" }
-save-plugins-warn-jvm = { module = "org.cqfn.save:warn-plugin-jvm", version.ref = "save-core" }
-save-plugins-fixAndWarn-jvm = { module = "org.cqfn.save:fix-and-warn-plugin-jvm", version.ref = "save-core" }
-save-reporters = { module = "org.cqfn.save:save-reporters", version.ref = "save-core" }
+save-common = { module = "com.saveourtool.save:save-common", version.ref = "save-core" }
+save-common-jvm = { module = "com.saveourtool.save:save-common-jvm", version.ref = "save-core" }
+save-core = { module = "com.saveourtool.save:save-core", version.ref = "save-core" }
+save-core-jvm = { module = "com.saveourtool.save:save-core-jvm", version.ref = "save-core" }
+save-plugins-fix = { module = "com.saveourtool.save:fix-plugin", version.ref = "save-core" }
+save-plugins-fix-jvm = { module = "com.saveourtool.save:fix-plugin-jvm", version.ref = "save-core" }
+save-plugins-warn-jvm = { module = "com.saveourtool.save:warn-plugin-jvm", version.ref = "save-core" }
+save-plugins-fixAndWarn-jvm = { module = "com.saveourtool.save:fix-and-warn-plugin-jvm", version.ref = "save-core" }
+save-reporters = { module = "com.saveourtool.save:save-reporters", version.ref = "save-core" }
 
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-plugin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
diff --git a/save-agent/build.gradle.kts b/save-agent/build.gradle.kts
index 800f0042b5..d5ae494932 100644
--- a/save-agent/build.gradle.kts
+++ b/save-agent/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.cqfn.save.buildutils.pathToSaveCliVersion
-import org.cqfn.save.buildutils.readSaveCliVersion
+import com.saveourtool.save.buildutils.pathToSaveCliVersion
+import com.saveourtool.save.buildutils.readSaveCliVersion
 
 plugins {
     kotlin("multiplatform")
@@ -10,7 +10,7 @@ kotlin {
     // Create a target for the host platform.
     val hostTarget = linuxX64 {
         binaries.executable {
-            entryPoint = "org.cqfn.save.agent.main"
+            entryPoint = "com.saveourtool.save.agent.main"
             baseName = "save-agent"
         }
         binaries.all {
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/AgentConfiguration.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/AgentConfiguration.kt
similarity index 98%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/AgentConfiguration.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/AgentConfiguration.kt
index 80e2ddc904..c9c8ccc81c 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/AgentConfiguration.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/AgentConfiguration.kt
@@ -2,7 +2,7 @@
  * Configuration classes for save-agent
  */
 
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
 import platform.posix.getenv
 
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/Main.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/Main.kt
similarity index 87%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/Main.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/Main.kt
index a1e526b010..92ee797fdd 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/Main.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/Main.kt
@@ -2,13 +2,13 @@
  * Main entrypoint for SAVE Agent
  */
 
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.agent.utils.logDebugCustom
-import org.cqfn.save.agent.utils.logInfoCustom
-import org.cqfn.save.agent.utils.readProperties
-import org.cqfn.save.core.config.LogType
-import org.cqfn.save.core.logging.logType
+import com.saveourtool.save.agent.utils.logDebugCustom
+import com.saveourtool.save.agent.utils.logInfoCustom
+import com.saveourtool.save.agent.utils.readProperties
+import com.saveourtool.save.core.config.LogType
+import com.saveourtool.save.core.logging.logType
 
 import generated.SAVE_CLOUD_VERSION
 import io.ktor.client.HttpClient
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/SaveAgent.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/SaveAgent.kt
similarity index 93%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/SaveAgent.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/SaveAgent.kt
index 2ad8b906dd..ad9562f880 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/SaveAgent.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/SaveAgent.kt
@@ -1,22 +1,22 @@
 @file:OptIn(ExperimentalCoroutinesApi::class)
 
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.agent.utils.logDebugCustom
-import org.cqfn.save.agent.utils.logErrorCustom
-import org.cqfn.save.agent.utils.logInfoCustom
-import org.cqfn.save.agent.utils.readFile
-import org.cqfn.save.agent.utils.sendDataToBackend
-import org.cqfn.save.core.logging.describe
-import org.cqfn.save.core.plugin.Plugin
-import org.cqfn.save.core.utils.ExecutionResult
-import org.cqfn.save.core.utils.ProcessBuilder
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.plugins.fix.FixPlugin
-import org.cqfn.save.reporter.Report
-import org.cqfn.save.utils.adjustLocation
-import org.cqfn.save.utils.toTestResultDebugInfo
-import org.cqfn.save.utils.toTestResultStatus
+import com.saveourtool.save.agent.utils.logDebugCustom
+import com.saveourtool.save.agent.utils.logErrorCustom
+import com.saveourtool.save.agent.utils.logInfoCustom
+import com.saveourtool.save.agent.utils.readFile
+import com.saveourtool.save.agent.utils.sendDataToBackend
+import com.saveourtool.save.core.logging.describe
+import com.saveourtool.save.core.plugin.Plugin
+import com.saveourtool.save.core.utils.ExecutionResult
+import com.saveourtool.save.core.utils.ProcessBuilder
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.plugins.fix.FixPlugin
+import com.saveourtool.save.reporter.Report
+import com.saveourtool.save.utils.adjustLocation
+import com.saveourtool.save.utils.toTestResultDebugInfo
+import com.saveourtool.save.utils.toTestResultStatus
 
 import generated.SAVE_CLOUD_VERSION
 import io.ktor.client.*
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/FileUtils.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/FileUtils.kt
similarity index 95%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/FileUtils.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/FileUtils.kt
index 180c0225f5..9056f1f736 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/FileUtils.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/FileUtils.kt
@@ -2,7 +2,7 @@
  * Utility methods to work with files using Okio
  */
 
-package org.cqfn.save.agent.utils
+package com.saveourtool.save.agent.utils
 
 import okio.FileNotFoundException
 import okio.FileSystem
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/HttpUtils.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/HttpUtils.kt
similarity index 90%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/HttpUtils.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/HttpUtils.kt
index 3a1c7f5e5e..942961ac78 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/HttpUtils.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/HttpUtils.kt
@@ -2,11 +2,11 @@
  * Utility methods for HTTP requests
  */
 
-package org.cqfn.save.agent.utils
+package com.saveourtool.save.agent.utils
 
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.RetryConfig
-import org.cqfn.save.agent.SaveAgent
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.RetryConfig
+import com.saveourtool.save.agent.SaveAgent
 
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpStatusCode
diff --git a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/Logging.kt b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/Logging.kt
similarity index 71%
rename from save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/Logging.kt
rename to save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/Logging.kt
index deebd47354..6692621a86 100644
--- a/save-agent/src/linuxX64Main/kotlin/org/cqfn/save/agent/utils/Logging.kt
+++ b/save-agent/src/linuxX64Main/kotlin/com/saveourtool/save/agent/utils/Logging.kt
@@ -4,11 +4,11 @@
 
 @file:Suppress("MISSING_KDOC_TOP_LEVEL", "MISSING_KDOC_ON_FUNCTION")
 
-package org.cqfn.save.agent.utils
+package com.saveourtool.save.agent.utils
 
-import org.cqfn.save.core.logging.logDebug
-import org.cqfn.save.core.logging.logError
-import org.cqfn.save.core.logging.logInfo
+import com.saveourtool.save.core.logging.logDebug
+import com.saveourtool.save.core.logging.logError
+import com.saveourtool.save.core.logging.logInfo
 
 import platform.linux.__NR_gettid
 import platform.posix.syscall
diff --git a/save-agent/src/linuxX64Test/kotlin/org/cqfn/save/agent/SaveAgentTest.kt b/save-agent/src/linuxX64Test/kotlin/com/saveourtool/save/agent/SaveAgentTest.kt
similarity index 97%
rename from save-agent/src/linuxX64Test/kotlin/org/cqfn/save/agent/SaveAgentTest.kt
rename to save-agent/src/linuxX64Test/kotlin/com/saveourtool/save/agent/SaveAgentTest.kt
index 3c33575956..b335437b5a 100644
--- a/save-agent/src/linuxX64Test/kotlin/org/cqfn/save/agent/SaveAgentTest.kt
+++ b/save-agent/src/linuxX64Test/kotlin/com/saveourtool/save/agent/SaveAgentTest.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.agent.utils.readProperties
+import com.saveourtool.save.agent.utils.readProperties
 
 import generated.SAVE_CORE_VERSION
 import io.ktor.client.HttpClient
diff --git a/save-api-cli/build.gradle.kts b/save-api-cli/build.gradle.kts
index e4505c805c..2100911598 100644
--- a/save-api-cli/build.gradle.kts
+++ b/save-api-cli/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 application {
-    mainClass.set("org.cqfn.save.apicli.MainKt")
+    mainClass.set("com.saveourtool.save.apicli.MainKt")
 }
 
 tasks.withType<KotlinCompile> {
diff --git a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/ArgsParsing.kt b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/ArgsParsing.kt
similarity index 92%
rename from save-api-cli/src/main/kotlin/org/cqfn/save/apicli/ArgsParsing.kt
rename to save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/ArgsParsing.kt
index cb31b8c0c1..8f0d067a2a 100644
--- a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/ArgsParsing.kt
+++ b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/ArgsParsing.kt
@@ -4,10 +4,10 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.apicli
+package com.saveourtool.save.apicli
 
-import org.cqfn.save.api.authorization.Authorization
-import org.cqfn.save.execution.ExecutionType
+import com.saveourtool.save.api.authorization.Authorization
+import com.saveourtool.save.execution.ExecutionType
 
 import org.slf4j.LoggerFactory
 
diff --git a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/Main.kt b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/Main.kt
similarity index 82%
rename from save-api-cli/src/main/kotlin/org/cqfn/save/apicli/Main.kt
rename to save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/Main.kt
index 79d3558ccf..3b8c0ea343 100644
--- a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/Main.kt
+++ b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/Main.kt
@@ -1,11 +1,11 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.apicli
+package com.saveourtool.save.apicli
 
-import org.cqfn.save.api.SaveCloudClient
-import org.cqfn.save.api.config.EvaluatedToolProperties
-import org.cqfn.save.api.config.PropertiesConfigurationType
-import org.cqfn.save.api.config.WebClientProperties
+import com.saveourtool.save.api.SaveCloudClient
+import com.saveourtool.save.api.config.EvaluatedToolProperties
+import com.saveourtool.save.api.config.PropertiesConfigurationType
+import com.saveourtool.save.api.config.WebClientProperties
 
 import java.lang.IllegalArgumentException
 
diff --git a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/PropertiesUtils.kt b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/PropertiesUtils.kt
similarity index 86%
rename from save-api-cli/src/main/kotlin/org/cqfn/save/apicli/PropertiesUtils.kt
rename to save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/PropertiesUtils.kt
index 3666521194..dfe88154b1 100644
--- a/save-api-cli/src/main/kotlin/org/cqfn/save/apicli/PropertiesUtils.kt
+++ b/save-api-cli/src/main/kotlin/com/saveourtool/save/apicli/PropertiesUtils.kt
@@ -2,13 +2,13 @@
  * Utils for configuration of http client and evaluated tool
  */
 
-package org.cqfn.save.apicli
+package com.saveourtool.save.apicli
 
-import org.cqfn.save.api.SaveCloudClient
-import org.cqfn.save.api.config.EvaluatedToolProperties
-import org.cqfn.save.api.config.PropertiesConfiguration
-import org.cqfn.save.api.config.PropertiesConfigurationType
-import org.cqfn.save.api.config.WebClientProperties
+import com.saveourtool.save.api.SaveCloudClient
+import com.saveourtool.save.api.config.EvaluatedToolProperties
+import com.saveourtool.save.api.config.PropertiesConfiguration
+import com.saveourtool.save.api.config.PropertiesConfigurationType
+import com.saveourtool.save.api.config.WebClientProperties
 
 import org.slf4j.LoggerFactory
 
diff --git a/save-api-cli/src/main/resources/evaluated-tool.properties b/save-api-cli/src/main/resources/evaluated-tool.properties
index 2bd40b1be1..63cf0115bf 100644
--- a/save-api-cli/src/main/resources/evaluated-tool.properties
+++ b/save-api-cli/src/main/resources/evaluated-tool.properties
@@ -2,7 +2,7 @@
 
 # Required
 # Name of organization
-organizationName=CQFN.org
+organizationName=saveourtool.com
 
 # Required
 # Name of project
@@ -14,7 +14,7 @@ sdk=Java 11
 
 # Required
 # Git URL of project
-gitUrl=https://github.com/analysis-dev/save-cli
+gitUrl=https://github.com/saveourtool/save-cli
 
 # Optional
 # Git username (generally, should be provided, only if tested project is private)
diff --git a/save-api/build.gradle.kts b/save-api/build.gradle.kts
index d3f1433dbf..d6997ec58c 100644
--- a/save-api/build.gradle.kts
+++ b/save-api/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.cqfn.save.buildutils.configurePublishing
+import com.saveourtool.save.buildutils.configurePublishing
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -35,7 +35,7 @@ dependencies {
 publishing {
     publications {
         create<MavenPublication>("maven") {
-            groupId = "org.cqfn"
+            groupId = "com.saveourtool"
             artifactId = "save-cloud-api"
             version = version
             from(components["java"])
diff --git a/save-api/src/main/kotlin/org/cqfn/save/api/SaveCloudClient.kt b/save-api/src/main/kotlin/com/saveourtool/save/api/SaveCloudClient.kt
similarity index 88%
rename from save-api/src/main/kotlin/org/cqfn/save/api/SaveCloudClient.kt
rename to save-api/src/main/kotlin/com/saveourtool/save/api/SaveCloudClient.kt
index d48b931abc..e8c0f197c4 100644
--- a/save-api/src/main/kotlin/org/cqfn/save/api/SaveCloudClient.kt
+++ b/save-api/src/main/kotlin/com/saveourtool/save/api/SaveCloudClient.kt
@@ -1,26 +1,26 @@
-package org.cqfn.save.api
-
-import org.cqfn.save.api.authorization.Authorization
-import org.cqfn.save.api.config.EvaluatedToolProperties
-import org.cqfn.save.api.config.WebClientProperties
-import org.cqfn.save.api.config.toSdk
-import org.cqfn.save.api.utils.getAvailableFilesList
-import org.cqfn.save.api.utils.getExecutionById
-import org.cqfn.save.api.utils.getLatestExecution
-import org.cqfn.save.api.utils.getProjectByNameAndOrganizationName
-import org.cqfn.save.api.utils.getStandardTestSuites
-import org.cqfn.save.api.utils.initializeHttpClient
-import org.cqfn.save.api.utils.submitExecution
-import org.cqfn.save.api.utils.uploadAdditionalFile
-import org.cqfn.save.domain.ShortFileInfo
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.ExecutionRequestBase
-import org.cqfn.save.entities.ExecutionRequestForStandardSuites
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionType
+package com.saveourtool.save.api
+
+import com.saveourtool.save.api.authorization.Authorization
+import com.saveourtool.save.api.config.EvaluatedToolProperties
+import com.saveourtool.save.api.config.WebClientProperties
+import com.saveourtool.save.api.config.toSdk
+import com.saveourtool.save.api.utils.getAvailableFilesList
+import com.saveourtool.save.api.utils.getExecutionById
+import com.saveourtool.save.api.utils.getLatestExecution
+import com.saveourtool.save.api.utils.getProjectByNameAndOrganizationName
+import com.saveourtool.save.api.utils.getStandardTestSuites
+import com.saveourtool.save.api.utils.initializeHttpClient
+import com.saveourtool.save.api.utils.submitExecution
+import com.saveourtool.save.api.utils.uploadAdditionalFile
+import com.saveourtool.save.domain.ShortFileInfo
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.ExecutionRequestBase
+import com.saveourtool.save.entities.ExecutionRequestForStandardSuites
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionType
 
 import io.ktor.client.*
 import io.ktor.http.*
diff --git a/save-api/src/main/kotlin/org/cqfn/save/api/authorization/Authorization.kt b/save-api/src/main/kotlin/com/saveourtool/save/api/authorization/Authorization.kt
similarity index 81%
rename from save-api/src/main/kotlin/org/cqfn/save/api/authorization/Authorization.kt
rename to save-api/src/main/kotlin/com/saveourtool/save/api/authorization/Authorization.kt
index 86c7641a5d..8352b3fa75 100644
--- a/save-api/src/main/kotlin/org/cqfn/save/api/authorization/Authorization.kt
+++ b/save-api/src/main/kotlin/com/saveourtool/save/api/authorization/Authorization.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.api.authorization
+package com.saveourtool.save.api.authorization
 
 /**
  * Authorization data
diff --git a/save-api/src/main/kotlin/org/cqfn/save/api/config/PropertiesConfiguration.kt b/save-api/src/main/kotlin/com/saveourtool/save/api/config/PropertiesConfiguration.kt
similarity index 93%
rename from save-api/src/main/kotlin/org/cqfn/save/api/config/PropertiesConfiguration.kt
rename to save-api/src/main/kotlin/com/saveourtool/save/api/config/PropertiesConfiguration.kt
index 2a65579054..b50fa82094 100644
--- a/save-api/src/main/kotlin/org/cqfn/save/api/config/PropertiesConfiguration.kt
+++ b/save-api/src/main/kotlin/com/saveourtool/save/api/config/PropertiesConfiguration.kt
@@ -2,11 +2,11 @@
  * Logic for configuration for http client and evaluated tool
  */
 
-package org.cqfn.save.api.config
+package com.saveourtool.save.api.config
 
-import org.cqfn.save.domain.Jdk
-import org.cqfn.save.domain.Python
-import org.cqfn.save.domain.Sdk
+import com.saveourtool.save.domain.Jdk
+import com.saveourtool.save.domain.Python
+import com.saveourtool.save.domain.Sdk
 
 import org.slf4j.LoggerFactory
 
diff --git a/save-api/src/main/kotlin/org/cqfn/save/api/utils/RequestUtils.kt b/save-api/src/main/kotlin/com/saveourtool/save/api/utils/RequestUtils.kt
similarity index 89%
rename from save-api/src/main/kotlin/org/cqfn/save/api/utils/RequestUtils.kt
rename to save-api/src/main/kotlin/com/saveourtool/save/api/utils/RequestUtils.kt
index 39505caa50..abf66c403b 100644
--- a/save-api/src/main/kotlin/org/cqfn/save/api/utils/RequestUtils.kt
+++ b/save-api/src/main/kotlin/com/saveourtool/save/api/utils/RequestUtils.kt
@@ -2,22 +2,22 @@
  * Utilities, which extends http client functionality and provide api for execution submission process
  */
 
-package org.cqfn.save.api.utils
-
-import org.cqfn.save.api.authorization.Authorization
-import org.cqfn.save.api.config.WebClientProperties
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.ShortFileInfo
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.ExecutionRequestBase
-import org.cqfn.save.entities.ExecutionRequestForStandardSuites
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.utils.LocalDateTimeSerializer
-import org.cqfn.save.utils.extractUserNameAndSource
-import org.cqfn.save.v1
+package com.saveourtool.save.api.utils
+
+import com.saveourtool.save.api.authorization.Authorization
+import com.saveourtool.save.api.config.WebClientProperties
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.ShortFileInfo
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.ExecutionRequestBase
+import com.saveourtool.save.entities.ExecutionRequestForStandardSuites
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.utils.LocalDateTimeSerializer
+import com.saveourtool.save.utils.extractUserNameAndSource
+import com.saveourtool.save.v1
 
 import io.ktor.client.*
 import io.ktor.client.call.*
diff --git a/save-backend/Backend-API.md b/save-backend/Backend-API.md
index 85c0121951..8392d7c2a4 100644
--- a/save-backend/Backend-API.md
+++ b/save-backend/Backend-API.md
@@ -46,7 +46,7 @@ organizationName=Huawei
 projectName='"save"'
 
 # Required
-gitUrl='"https://github.com/analysis-dev/save-cli"'
+gitUrl='"https://github.com/saveourtool/save-cli"'
 
 # Optional
 sdkName='"openjdk"'
diff --git a/save-backend/build.gradle.kts b/save-backend/build.gradle.kts
index 316a287f91..8793efeb99 100644
--- a/save-backend/build.gradle.kts
+++ b/save-backend/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.cqfn.save.buildutils.configureJacoco
-import org.cqfn.save.buildutils.configureSpringBoot
+import com.saveourtool.save.buildutils.configureJacoco
+import com.saveourtool.save.buildutils.configureSpringBoot
 
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/SaveApplication.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/SaveApplication.kt
similarity index 86%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/SaveApplication.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/SaveApplication.kt
index e4539912f8..238bb91be2 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/SaveApplication.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/SaveApplication.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend
+package com.saveourtool.save.backend
 
-import org.cqfn.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.configs.ConfigProperties
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApiSwaggerSupport.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApiSwaggerSupport.kt
similarity index 96%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApiSwaggerSupport.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApiSwaggerSupport.kt
index a5a5438e87..2e9b58ce0f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApiSwaggerSupport.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApiSwaggerSupport.kt
@@ -2,7 +2,7 @@
  * Utilities related to Swagger
  */
 
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
 import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.enums.ParameterIn
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApplicationConfiguration.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApplicationConfiguration.kt
similarity index 77%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApplicationConfiguration.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApplicationConfiguration.kt
index 0567c022c2..42abe6007f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ApplicationConfiguration.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ApplicationConfiguration.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
 import org.springframework.boot.actuate.autoconfigure.metrics.orm.jpa.HibernateMetricsAutoConfiguration
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration
@@ -9,8 +9,8 @@ import org.springframework.web.reactive.config.EnableWebFlux
 
 @Configuration
 @EnableWebFlux
-@EnableJpaRepositories(basePackages = ["org.cqfn.save.backend.repository"])
-@EntityScan("org.cqfn.save.entities")
+@EnableJpaRepositories(basePackages = ["com.saveourtool.save.backend.repository"])
+@EntityScan("com.saveourtool.save.entities")
 @ImportAutoConfiguration(HibernateMetricsAutoConfiguration::class)
 @Suppress("MISSING_KDOC_TOP_LEVEL")
 class ApplicationConfiguration
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ConfigProperties.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ConfigProperties.kt
similarity index 95%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ConfigProperties.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ConfigProperties.kt
index 29b1b105f0..cead390b7c 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/ConfigProperties.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/ConfigProperties.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/CorsFilter.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/CorsFilter.kt
similarity index 97%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/CorsFilter.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/CorsFilter.kt
index 77b9fd6b6b..7feaa28567 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/CorsFilter.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/CorsFilter.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
 import org.springframework.context.annotation.Profile
 import org.springframework.http.HttpMethod
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/UserLoggingFilter.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/UserLoggingFilter.kt
similarity index 94%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/UserLoggingFilter.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/UserLoggingFilter.kt
index b85604659e..e7041cb92a 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/UserLoggingFilter.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/UserLoggingFilter.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfig.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfig.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfig.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfig.kt
index 1d248f7c84..8275fa1a95 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfig.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfig.kt
@@ -5,13 +5,13 @@
     "MISSING_KDOC_ON_FUNCTION",
 )
 
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
-import org.cqfn.save.core.result.Crash
-import org.cqfn.save.core.result.Fail
-import org.cqfn.save.core.result.Ignored
-import org.cqfn.save.core.result.Pass
-import org.cqfn.save.core.result.TestStatus
+import com.saveourtool.save.core.result.Crash
+import com.saveourtool.save.core.result.Fail
+import com.saveourtool.save.core.result.Ignored
+import com.saveourtool.save.core.result.Pass
+import com.saveourtool.save.core.result.TestStatus
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfiguration.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfiguration.kt
similarity index 97%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfiguration.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfiguration.kt
index d0b85733cc..4a9352d2d5 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebConfiguration.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebConfiguration.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
-import org.cqfn.save.backend.utils.toInstant
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.utils.toInstant
+import com.saveourtool.save.v1
 
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.info.BuildProperties
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebSecurityConfig.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebSecurityConfig.kt
similarity index 94%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebSecurityConfig.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebSecurityConfig.kt
index c9239e4507..dcc852afd4 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/configs/WebSecurityConfig.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/configs/WebSecurityConfig.kt
@@ -2,12 +2,12 @@
  * Configuration beans for security in different profiles
  */
 
-package org.cqfn.save.backend.configs
+package com.saveourtool.save.backend.configs
 
-import org.cqfn.save.backend.utils.ConvertingAuthenticationManager
-import org.cqfn.save.backend.utils.CustomAuthenticationBasicConverter
-import org.cqfn.save.domain.Role
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.utils.ConvertingAuthenticationManager
+import com.saveourtool.save.backend.utils.CustomAuthenticationBasicConverter
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.v1
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Profile
@@ -56,7 +56,7 @@ class WebSecurityConfig(
                 .authenticated()
         }
         .and().run {
-            // FixMe: Properly support CSRF protection https://github.com/analysis-dev/save-cloud/issues/34
+            // FixMe: Properly support CSRF protection https://github.com/saveourtool/save-cloud/issues/34
             csrf().disable()
         }
         .addFilterBefore(
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/AwesomeBenchmarksController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/AwesomeBenchmarksController.kt
similarity index 83%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/AwesomeBenchmarksController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/AwesomeBenchmarksController.kt
index a6ae389ebf..5733d08fee 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/AwesomeBenchmarksController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/AwesomeBenchmarksController.kt
@@ -4,11 +4,11 @@
  * 2) to get benchmarks for the Frontend
  */
 
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.service.AwesomeBenchmarksService
-import org.cqfn.save.entities.benchmarks.BenchmarkEntity
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.service.AwesomeBenchmarksService
+import com.saveourtool.save.entities.benchmarks.BenchmarkEntity
+import com.saveourtool.save.v1
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.*
 
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CheckGitConnectivityController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CheckGitConnectivityController.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CheckGitConnectivityController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CheckGitConnectivityController.kt
index db23fa60d2..6d69153245 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CheckGitConnectivityController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CheckGitConnectivityController.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.v1
 
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.GetMapping
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CloneRepositoryController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CloneRepositoryController.kt
similarity index 88%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CloneRepositoryController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CloneRepositoryController.kt
index 706836548c..3994b94ed0 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/CloneRepositoryController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/CloneRepositoryController.kt
@@ -1,23 +1,23 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.StringResponse
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.backend.repository.TimestampBasedFileSystemRepository
-import org.cqfn.save.backend.service.ExecutionService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.backend.utils.username
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.Sdk
-import org.cqfn.save.domain.ShortFileInfo
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.ExecutionRequestBase
-import org.cqfn.save.entities.ExecutionRequestForStandardSuites
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.StringResponse
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.repository.TimestampBasedFileSystemRepository
+import com.saveourtool.save.backend.service.ExecutionService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.backend.utils.username
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.Sdk
+import com.saveourtool.save.domain.ShortFileInfo
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.ExecutionRequestBase
+import com.saveourtool.save.entities.ExecutionRequestForStandardSuites
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.v1
 
 import org.slf4j.LoggerFactory
 import org.springframework.boot.web.reactive.function.client.WebClientCustomizer
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/DownloadFilesController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/DownloadFilesController.kt
similarity index 89%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/DownloadFilesController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/DownloadFilesController.kt
index 0701dd1c2b..e829b46fb5 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/DownloadFilesController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/DownloadFilesController.kt
@@ -1,18 +1,18 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.backend.ByteArrayResponse
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.TestDataFilesystemRepository
-import org.cqfn.save.backend.repository.TimestampBasedFileSystemRepository
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.from
-import org.cqfn.save.utils.AvatarType
-import org.cqfn.save.v1
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.backend.ByteArrayResponse
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.TestDataFilesystemRepository
+import com.saveourtool.save.backend.repository.TimestampBasedFileSystemRepository
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.from
+import com.saveourtool.save.utils.AvatarType
+import com.saveourtool.save.v1
 
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ExecutionController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ExecutionController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt
index 94eb7c6a07..21b4392f18 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ExecutionController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ExecutionController.kt
@@ -1,28 +1,28 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.AgentService
-import org.cqfn.save.backend.service.AgentStatusService
-import org.cqfn.save.backend.service.ExecutionService
-import org.cqfn.save.backend.service.GitService
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.backend.service.TestExecutionService
-import org.cqfn.save.backend.service.TestSuitesService
-import org.cqfn.save.backend.utils.justOrNotFound
-import org.cqfn.save.backend.utils.username
-import org.cqfn.save.core.utils.runIf
-import org.cqfn.save.domain.toSdk
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionInitializationDto
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.execution.ExecutionUpdateDto
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.AgentService
+import com.saveourtool.save.backend.service.AgentStatusService
+import com.saveourtool.save.backend.service.ExecutionService
+import com.saveourtool.save.backend.service.GitService
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.backend.service.TestExecutionService
+import com.saveourtool.save.backend.service.TestSuitesService
+import com.saveourtool.save.backend.utils.justOrNotFound
+import com.saveourtool.save.backend.utils.username
+import com.saveourtool.save.core.utils.runIf
+import com.saveourtool.save.domain.toSdk
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionInitializationDto
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.execution.ExecutionUpdateDto
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.v1
 
 import org.slf4j.LoggerFactory
 import org.springframework.boot.web.reactive.function.client.WebClientCustomizer
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserOrganizationController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserOrganizationController.kt
similarity index 93%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserOrganizationController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserOrganizationController.kt
index 3b2722ee9e..7563240ccd 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserOrganizationController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserOrganizationController.kt
@@ -5,19 +5,19 @@
  * 3) to remove users from organizations
  */
 
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.service.LnkUserOrganizationService
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.OrganizationStatus
-import org.cqfn.save.info.OrganizationInfo
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.permission.SetRoleRequest
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.service.LnkUserOrganizationService
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.OrganizationStatus
+import com.saveourtool.save.info.OrganizationInfo
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.permission.SetRoleRequest
+import com.saveourtool.save.v1
 
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import org.slf4j.LoggerFactory
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserProjectController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserProjectController.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserProjectController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserProjectController.kt
index 7537526041..26c70b5f4f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/LnkUserProjectController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/LnkUserProjectController.kt
@@ -5,15 +5,15 @@
  * 3) to remove users from projects
  */
 
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.LnkUserProjectService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.domain.Role
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.LnkUserProjectService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.v1
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.security.core.Authentication
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/OrganizationController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/OrganizationController.kt
similarity index 89%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/OrganizationController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/OrganizationController.kt
index be1fb8c579..c72b93dfe2 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/OrganizationController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/OrganizationController.kt
@@ -1,15 +1,15 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.StringResponse
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.service.LnkUserOrganizationService
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.ImageInfo
-import org.cqfn.save.domain.OrganizationSaveStatus
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.StringResponse
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.service.LnkUserOrganizationService
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.ImageInfo
+import com.saveourtool.save.domain.OrganizationSaveStatus
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.v1
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/PermissionController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/PermissionController.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/PermissionController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/PermissionController.kt
index 3ac9e39fc8..83f271e204 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/PermissionController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/PermissionController.kt
@@ -1,19 +1,19 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.configs.ApiSwaggerSupport
-import org.cqfn.save.backend.configs.RequiresAuthorizationSourceHeader
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.PermissionService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.backend.utils.toUser
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.permission.SetRoleRequest
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.configs.ApiSwaggerSupport
+import com.saveourtool.save.backend.configs.RequiresAuthorizationSourceHeader
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.PermissionService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.backend.utils.toUser
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.permission.SetRoleRequest
+import com.saveourtool.save.v1
 
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.responses.ApiResponse
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ProjectController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ProjectController.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ProjectController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ProjectController.kt
index 789ff25239..5bd66fc971 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/ProjectController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/ProjectController.kt
@@ -1,20 +1,20 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.StringResponse
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.GitService
-import org.cqfn.save.backend.service.LnkUserProjectService
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.ProjectSaveStatus
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.NewProjectDto
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.ProjectStatus
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.StringResponse
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.GitService
+import com.saveourtool.save.backend.service.LnkUserProjectService
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.ProjectSaveStatus
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.NewProjectDto
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.ProjectStatus
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.v1
 
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestExecutionController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestExecutionController.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestExecutionController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestExecutionController.kt
index ea23b35541..3ec9fc553f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestExecutionController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestExecutionController.kt
@@ -1,21 +1,21 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.agent.TestSuiteExecutionStatisticDto
-import org.cqfn.save.backend.configs.ApiSwaggerSupport
-import org.cqfn.save.backend.configs.RequiresAuthorizationSourceHeader
-import org.cqfn.save.backend.repository.TestDataFilesystemRepository
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.ExecutionService
-import org.cqfn.save.backend.service.TestExecutionService
-import org.cqfn.save.backend.utils.justOrNotFound
-import org.cqfn.save.core.utils.runIf
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.test.TestDto
-import org.cqfn.save.v1
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.agent.TestSuiteExecutionStatisticDto
+import com.saveourtool.save.backend.configs.ApiSwaggerSupport
+import com.saveourtool.save.backend.configs.RequiresAuthorizationSourceHeader
+import com.saveourtool.save.backend.repository.TestDataFilesystemRepository
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.ExecutionService
+import com.saveourtool.save.backend.service.TestExecutionService
+import com.saveourtool.save.backend.utils.justOrNotFound
+import com.saveourtool.save.core.utils.runIf
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.test.TestDto
+import com.saveourtool.save.v1
 
 import io.swagger.v3.oas.annotations.tags.Tag
 import io.swagger.v3.oas.annotations.tags.Tags
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestSuitesController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestSuitesController.kt
similarity index 91%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestSuitesController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestSuitesController.kt
index bd66a48903..d6826044aa 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/TestSuitesController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/TestSuitesController.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.service.TestSuitesService
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.service.TestSuitesService
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.v1
 
 import org.quartz.JobKey
 import org.quartz.Scheduler
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/UsersDetailsController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/UsersDetailsController.kt
similarity index 86%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/UsersDetailsController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/UsersDetailsController.kt
index 9506a49cf2..ebf999f7e7 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/UsersDetailsController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/UsersDetailsController.kt
@@ -1,14 +1,14 @@
-package org.cqfn.save.backend.controllers
+package com.saveourtool.save.backend.controllers
 
-import org.cqfn.save.backend.StringResponse
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.justOrNotFound
-import org.cqfn.save.domain.ImageInfo
-import org.cqfn.save.domain.Role
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.StringResponse
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.justOrNotFound
+import com.saveourtool.save.domain.ImageInfo
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.v1
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.security.access.prepost.PreAuthorize
@@ -20,7 +20,7 @@ import reactor.core.publisher.Mono
 /**
  * Controller that handles operation with users
  */
-// TODO: https://github.com/analysis-dev/save-cloud/issues/656
+// TODO: https://github.com/saveourtool/save-cloud/issues/656
 @RestController
 @RequestMapping(path = ["/api/$v1/users"])
 class UsersDetailsController(
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/AgentsController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/AgentsController.kt
similarity index 91%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/AgentsController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/AgentsController.kt
index 39ea1048ae..10f50d3d9e 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/AgentsController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/AgentsController.kt
@@ -1,12 +1,12 @@
-package org.cqfn.save.backend.controllers.internal
+package com.saveourtool.save.backend.controllers.internal
 
-import org.cqfn.save.agent.AgentVersion
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.AgentStatusRepository
-import org.cqfn.save.entities.Agent
-import org.cqfn.save.entities.AgentStatus
-import org.cqfn.save.entities.AgentStatusDto
-import org.cqfn.save.entities.AgentStatusesForExecution
+import com.saveourtool.save.agent.AgentVersion
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.entities.Agent
+import com.saveourtool.save.entities.AgentStatus
+import com.saveourtool.save.entities.AgentStatusDto
+import com.saveourtool.save.entities.AgentStatusesForExecution
 import org.slf4j.LoggerFactory
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.bind.annotation.GetMapping
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/TestController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/TestController.kt
similarity index 91%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/TestController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/TestController.kt
index 77145a2938..51fae6e9d1 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/TestController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/TestController.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.controllers.internal
+package com.saveourtool.save.backend.controllers.internal
 
-import org.cqfn.save.backend.service.TestExecutionService
-import org.cqfn.save.backend.service.TestService
-import org.cqfn.save.entities.Test
-import org.cqfn.save.test.TestDto
+import com.saveourtool.save.backend.service.TestExecutionService
+import com.saveourtool.save.backend.service.TestService
+import com.saveourtool.save.entities.Test
+import com.saveourtool.save.test.TestDto
 
 import io.micrometer.core.instrument.MeterRegistry
 import org.slf4j.LoggerFactory
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/UsersController.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
similarity index 83%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/UsersController.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
index f57d06a174..ae1d7a3025 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/controllers/internal/UsersController.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/internal/UsersController.kt
@@ -1,11 +1,11 @@
-package org.cqfn.save.backend.controllers.internal
+package com.saveourtool.save.backend.controllers.internal
 
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.entities.User
-import org.cqfn.save.utils.IdentitySourceAwareUserDetails
-import org.cqfn.save.utils.IdentitySourceAwareUserDetailsMixin
-import org.cqfn.save.utils.extractUserNameAndSource
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetails
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetailsMixin
+import com.saveourtool.save.utils.extractUserNameAndSource
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.slf4j.LoggerFactory
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt
similarity index 98%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt
index 69b2c5b031..e2d6ee55b2 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/postprocessor/DockerSecretsDatabaseProcessor.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.postprocessor
+package com.saveourtool.save.backend.postprocessor
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.env.EnvironmentPostProcessor
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AgentStatusRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AgentStatusRepository.kt
similarity index 93%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AgentStatusRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AgentStatusRepository.kt
index b25657e814..34c7c614a4 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AgentStatusRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AgentStatusRepository.kt
@@ -2,10 +2,10 @@
  * JPA repositories for Agent related data
  */
 
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Agent
-import org.cqfn.save.entities.AgentStatus
+import com.saveourtool.save.entities.Agent
+import com.saveourtool.save.entities.AgentStatus
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
 import org.springframework.stereotype.Repository
 import javax.transaction.Transactional
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AwesomeBenchmarksRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AwesomeBenchmarksRepository.kt
similarity index 75%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AwesomeBenchmarksRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AwesomeBenchmarksRepository.kt
index 4cdf334c76..b3b1645abd 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/AwesomeBenchmarksRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/AwesomeBenchmarksRepository.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.benchmarks.AwesomeBenchmarks
+import com.saveourtool.save.entities.benchmarks.AwesomeBenchmarks
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
 import org.springframework.stereotype.Repository
 
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/BaseEntityRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/BaseEntityRepository.kt
similarity index 74%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/BaseEntityRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/BaseEntityRepository.kt
index 33aa4fdedd..c0be987286 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/BaseEntityRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/BaseEntityRepository.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.BaseEntity
+import com.saveourtool.save.entities.BaseEntity
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.repository.NoRepositoryBean
 
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ExecutionRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ExecutionRepository.kt
similarity index 84%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ExecutionRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ExecutionRepository.kt
index f6b17178b8..c985c82c13 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ExecutionRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ExecutionRepository.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.Project
 import org.springframework.stereotype.Repository
 import java.util.Optional
 
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/GitRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/GitRepository.kt
similarity index 66%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/GitRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/GitRepository.kt
index ec36f5a700..55cf0f7377 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/GitRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/GitRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Git
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Git
+import com.saveourtool.save.entities.Project
 import org.springframework.stereotype.Repository
 
 /**
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserOrganizationRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserOrganizationRepository.kt
similarity index 93%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserOrganizationRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserOrganizationRepository.kt
index b5745e5c14..58e887570f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserOrganizationRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserOrganizationRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.LnkUserOrganization
-import org.cqfn.save.entities.Organization
+import com.saveourtool.save.entities.LnkUserOrganization
+import com.saveourtool.save.entities.Organization
 import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.query.Param
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserProjectRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserProjectRepository.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserProjectRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserProjectRepository.kt
index 85391b1674..67df54b1d2 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/LnkUserProjectRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/LnkUserProjectRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.LnkUserProject
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.LnkUserProject
+import com.saveourtool.save.entities.Project
 import org.springframework.data.jpa.repository.Modifying
 import org.springframework.data.jpa.repository.Query
 import org.springframework.data.repository.query.Param
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/OrganizationRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/OrganizationRepository.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/OrganizationRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/OrganizationRepository.kt
index e8c9f624a8..cbed29a360 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/OrganizationRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/OrganizationRepository.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Organization
+import com.saveourtool.save.entities.Organization
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
 import org.springframework.data.repository.query.QueryByExampleExecutor
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ProjectRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ProjectRepository.kt
similarity index 87%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ProjectRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ProjectRepository.kt
index 3ea7fcbcbf..5ef9694937 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/ProjectRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/ProjectRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.Project
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
 import org.springframework.data.repository.query.QueryByExampleExecutor
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestDataFilesystemRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestDataFilesystemRepository.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestDataFilesystemRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestDataFilesystemRepository.kt
index f07899e46b..e516c25112 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestDataFilesystemRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestDataFilesystemRepository.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.entities.TestExecution
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.entities.TestExecution
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import okio.Path.Companion.toPath
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestExecutionRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestExecutionRepository.kt
similarity index 97%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestExecutionRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestExecutionRepository.kt
index b68c90a304..eec6bdc5c4 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestExecutionRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestExecutionRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.TestExecution
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.TestExecution
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor
 import org.springframework.data.jpa.repository.Query
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestRepository.kt
similarity index 84%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestRepository.kt
index c6a6ddfbef..246b9133e8 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestRepository.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.Test
+import com.saveourtool.save.entities.Test
 import org.springframework.stereotype.Repository
 
 import java.util.Optional
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestSuiteRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestSuiteRepository.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestSuiteRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestSuiteRepository.kt
index a0ef159811..81d534ae70 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TestSuiteRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TestSuiteRepository.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.testsuite.TestSuiteType
 import org.springframework.data.repository.query.QueryByExampleExecutor
 import org.springframework.stereotype.Repository
 
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TimestampBasedFileSystemRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TimestampBasedFileSystemRepository.kt
similarity index 95%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TimestampBasedFileSystemRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TimestampBasedFileSystemRepository.kt
index c2eae26925..4f07911b6b 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/TimestampBasedFileSystemRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/TimestampBasedFileSystemRepository.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.ImageInfo
-import org.cqfn.save.domain.ShortFileInfo
-import org.cqfn.save.utils.AvatarType
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.ImageInfo
+import com.saveourtool.save.domain.ShortFileInfo
+import com.saveourtool.save.utils.AvatarType
 
 import org.slf4j.LoggerFactory
 import org.springframework.core.io.FileSystemResource
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/UserRepository.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/UserRepository.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/repository/UserRepository.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/UserRepository.kt
index 258ce5389b..251b928727 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/repository/UserRepository.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/repository/UserRepository.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.repository
+package com.saveourtool.save.backend.repository
 
-import org.cqfn.save.entities.User
+import com.saveourtool.save.entities.User
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Repository
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/scheduling/StandardSuitesUpdateScheduler.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/scheduling/StandardSuitesUpdateScheduler.kt
similarity index 96%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/scheduling/StandardSuitesUpdateScheduler.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/scheduling/StandardSuitesUpdateScheduler.kt
index 170bdd8633..e61583685f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/scheduling/StandardSuitesUpdateScheduler.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/scheduling/StandardSuitesUpdateScheduler.kt
@@ -2,9 +2,9 @@
  * Support for scheduling updates of standard suites
  */
 
-package org.cqfn.save.backend.scheduling
+package com.saveourtool.save.backend.scheduling
 
-import org.cqfn.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.configs.ConfigProperties
 import org.quartz.CronScheduleBuilder
 import org.quartz.Job
 import org.quartz.JobBuilder
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluator.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluator.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluator.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluator.kt
index 7922eab581..6a324b239a 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluator.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluator.kt
@@ -1,11 +1,11 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.service.LnkUserOrganizationService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
+import com.saveourtool.save.backend.service.LnkUserOrganizationService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.core.Authentication
 import org.springframework.stereotype.Component
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluator.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluator.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluator.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluator.kt
index e4f09f1d83..a6052cd185 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluator.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluator.kt
@@ -1,13 +1,13 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.repository.LnkUserProjectRepository
-import org.cqfn.save.backend.service.LnkUserProjectService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
+import com.saveourtool.save.backend.repository.LnkUserProjectRepository
+import com.saveourtool.save.backend.service.LnkUserProjectService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
 import org.springframework.security.core.Authentication
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentService.kt
similarity index 85%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentService.kt
index f7c96d2c08..7a346bf625 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentService.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.AgentRepository
 import org.springframework.stereotype.Service
 
 /**
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentStatusService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentStatusService.kt
similarity index 85%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentStatusService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentStatusService.kt
index 33ed388a25..093d5b3e52 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AgentStatusService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AgentStatusService.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.backend.repository.AgentStatusRepository
 import org.springframework.stereotype.Service
 
 /**
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AwesomeBenchmarksService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AwesomeBenchmarksService.kt
similarity index 78%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/AwesomeBenchmarksService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AwesomeBenchmarksService.kt
index ef88f78ebe..decdbb49b5 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/AwesomeBenchmarksService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/AwesomeBenchmarksService.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.AwesomeBenchmarksRepository
-import org.cqfn.save.entities.benchmarks.AwesomeBenchmarks
-import org.cqfn.save.entities.benchmarks.BenchmarkEntity
-import org.cqfn.save.entities.benchmarks.toEntity
+import com.saveourtool.save.backend.repository.AwesomeBenchmarksRepository
+import com.saveourtool.save.entities.benchmarks.AwesomeBenchmarks
+import com.saveourtool.save.entities.benchmarks.BenchmarkEntity
+import com.saveourtool.save.entities.benchmarks.toEntity
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/ExecutionService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ExecutionService.kt
similarity index 91%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/ExecutionService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ExecutionService.kt
index d233dedf18..a87a348c18 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/ExecutionService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ExecutionService.kt
@@ -1,14 +1,14 @@
-package org.cqfn.save.backend.service
-
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.execution.ExecutionInitializationDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionUpdateDto
+package com.saveourtool.save.backend.service
+
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.execution.ExecutionInitializationDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionUpdateDto
 
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/GitService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/GitService.kt
similarity index 72%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/GitService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/GitService.kt
index ef7754833c..b4c507ee20 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/GitService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/GitService.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.GitRepository
-import org.cqfn.save.entities.Git
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.backend.repository.GitRepository
+import com.saveourtool.save.entities.Git
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.Project
 import org.springframework.stereotype.Service
 
 /**
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserOrganizationService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserOrganizationService.kt
similarity index 94%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserOrganizationService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserOrganizationService.kt
index 6b3cb2bc4a..f8b750148b 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserOrganizationService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserOrganizationService.kt
@@ -1,11 +1,11 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.LnkUserOrganizationRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.*
-import org.cqfn.save.utils.getHighestRole
+import com.saveourtool.save.backend.repository.LnkUserOrganizationRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.utils.getHighestRole
 import org.springframework.data.domain.PageRequest
 import org.springframework.security.core.Authentication
 import org.springframework.stereotype.Service
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserProjectService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserProjectService.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserProjectService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserProjectService.kt
index c17af03b20..fb080e67e7 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/LnkUserProjectService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/LnkUserProjectService.kt
@@ -1,13 +1,13 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.LnkUserProjectRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.LnkUserProject
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.utils.getHighestRole
+import com.saveourtool.save.backend.repository.LnkUserProjectRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.LnkUserProject
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.utils.getHighestRole
 import org.springframework.data.domain.PageRequest
 import org.springframework.security.core.Authentication
 import org.springframework.stereotype.Service
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/OrganizationService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/OrganizationService.kt
similarity index 90%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/OrganizationService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/OrganizationService.kt
index afa4fd50e5..8d8945b5a5 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/OrganizationService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/OrganizationService.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.OrganizationRepository
-import org.cqfn.save.domain.OrganizationSaveStatus
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.OrganizationStatus
+import com.saveourtool.save.backend.repository.OrganizationRepository
+import com.saveourtool.save.domain.OrganizationSaveStatus
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.OrganizationStatus
 import org.springframework.stereotype.Service
 
 /**
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/PermissionService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/PermissionService.kt
similarity index 88%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/PermissionService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/PermissionService.kt
index cab5f1a44f..0b6f9381cb 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/PermissionService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/PermissionService.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.SetRoleRequest
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.SetRoleRequest
 import org.springframework.stereotype.Service
 import reactor.core.publisher.Mono
 import reactor.kotlin.core.util.function.component1
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/ProjectService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ProjectService.kt
similarity index 89%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/ProjectService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ProjectService.kt
index b04e75206e..8302e36e2f 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/ProjectService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/ProjectService.kt
@@ -1,14 +1,14 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.domain.ProjectSaveStatus
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.ProjectStatus
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.domain.ProjectSaveStatus
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.ProjectStatus
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
 
 import org.springframework.data.domain.Example
 import org.springframework.data.domain.ExampleMatcher
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestExecutionService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestExecutionService.kt
similarity index 95%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestExecutionService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestExecutionService.kt
index 7e3a2d58e0..1734d25866 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestExecutionService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestExecutionService.kt
@@ -1,15 +1,15 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.repository.TestRepository
-import org.cqfn.save.backend.utils.secondsToLocalDateTime
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.TestExecution
-import org.cqfn.save.test.TestDto
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.repository.TestRepository
+import com.saveourtool.save.backend.utils.secondsToLocalDateTime
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.TestExecution
+import com.saveourtool.save.test.TestDto
 
 import org.slf4j.LoggerFactory
 import org.springframework.data.domain.PageRequest
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestService.kt
similarity index 89%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestService.kt
index 3dc94ab529..128e855672 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestService.kt
@@ -1,17 +1,17 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.repository.TestRepository
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Test
-import org.cqfn.save.entities.TestExecution
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.test.TestBatch
-import org.cqfn.save.test.TestDto
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.repository.TestRepository
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Test
+import com.saveourtool.save.entities.TestExecution
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.test.TestBatch
+import com.saveourtool.save.test.TestDto
 
 import org.slf4j.LoggerFactory
 import org.springframework.data.domain.PageRequest
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestSuitesService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestSuitesService.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestSuitesService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestSuitesService.kt
index a1c328be35..f5920bcbd6 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/TestSuitesService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/TestSuitesService.kt
@@ -1,13 +1,13 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.repository.TestRepository
-import org.cqfn.save.backend.repository.TestSuiteRepository
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.repository.TestRepository
+import com.saveourtool.save.backend.repository.TestSuiteRepository
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
 import org.slf4j.LoggerFactory
 import org.springframework.data.domain.Example
 import org.springframework.stereotype.Service
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/UserDetailsService.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt
similarity index 92%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/service/UserDetailsService.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt
index a6ecdfd2b8..aa8b08a4f7 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/service/UserDetailsService.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/service/UserDetailsService.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.User
-import org.cqfn.save.utils.IdentitySourceAwareUserDetails
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetails
 import org.slf4j.LoggerFactory
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ApiGroupsConfiguration.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ApiGroupsConfiguration.kt
similarity index 84%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ApiGroupsConfiguration.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ApiGroupsConfiguration.kt
index eeba474342..1ede3f6f9e 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ApiGroupsConfiguration.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ApiGroupsConfiguration.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
-import org.cqfn.save.latestVersion
-import org.cqfn.save.v1
+import com.saveourtool.save.latestVersion
+import com.saveourtool.save.v1
 
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.OpenAPI
@@ -21,7 +21,7 @@ class ApiGroupsConfiguration {
     fun openApiAll(): GroupedOpenApi? = GroupedOpenApi.builder()
         .group("all")
         .pathsToMatch("/api/**")
-        .packagesToScan("org.cqfn.save.backend.controllers")
+        .packagesToScan("com.saveourtool.save.backend.controllers")
         .build()
 
     @Bean
@@ -43,6 +43,6 @@ class ApiGroupsConfiguration {
         .group(groupName)
         .pathsToMatch("/api/$version/**")
         .pathsToExclude("?!(/api/$version).+")
-        .packagesToScan("org.cqfn.save.backend.controllers")
+        .packagesToScan("com.saveourtool.save.backend.controllers")
         .build()
 }
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/AuthenticationDetails.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/AuthenticationDetails.kt
similarity index 77%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/AuthenticationDetails.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/AuthenticationDetails.kt
index 357a9b667e..55092777de 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/AuthenticationDetails.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/AuthenticationDetails.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 /**
  * @property id
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ConvertingAuthenticationManager.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ConvertingAuthenticationManager.kt
similarity index 94%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ConvertingAuthenticationManager.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ConvertingAuthenticationManager.kt
index d858fcf97c..07601f63b4 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ConvertingAuthenticationManager.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ConvertingAuthenticationManager.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.utils.IdentitySourceAwareUserDetails
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.utils.IdentitySourceAwareUserDetails
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.authentication.BadCredentialsException
 import org.springframework.security.authentication.ReactiveAuthenticationManager
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/CustomAuthenticationBasicConverter.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/CustomAuthenticationBasicConverter.kt
similarity index 97%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/CustomAuthenticationBasicConverter.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/CustomAuthenticationBasicConverter.kt
index 0a4c3235a5..5fe309ff1c 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/CustomAuthenticationBasicConverter.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/CustomAuthenticationBasicConverter.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/LongUtils.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/LongUtils.kt
similarity index 91%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/LongUtils.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/LongUtils.kt
index 482f262550..bb64397ab3 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/LongUtils.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/LongUtils.kt
@@ -2,7 +2,7 @@
  * Util class for Long type
  */
 
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import java.time.Instant
 import java.time.LocalDateTime
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ReactorUtils.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ReactorUtils.kt
similarity index 97%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ReactorUtils.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ReactorUtils.kt
index c89ba54eba..35e8d076a6 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/ReactorUtils.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/ReactorUtils.kt
@@ -2,7 +2,7 @@
  * Utility methods for working with Reactor publishers
  */
 
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import org.springframework.http.HttpStatus
 import org.springframework.web.server.ResponseStatusException
diff --git a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/SecurityUtils.kt b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/SecurityUtils.kt
similarity index 94%
rename from save-backend/src/main/kotlin/org/cqfn/save/backend/utils/SecurityUtils.kt
rename to save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/SecurityUtils.kt
index 4f154cf523..69500f00ff 100644
--- a/save-backend/src/main/kotlin/org/cqfn/save/backend/utils/SecurityUtils.kt
+++ b/save-backend/src/main/kotlin/com/saveourtool/save/backend/utils/SecurityUtils.kt
@@ -2,9 +2,9 @@
  * Utility methods for spring-security
  */
 
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
-import org.cqfn.save.entities.User
+import com.saveourtool.save.entities.User
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
 import org.springframework.security.core.userdetails.UserDetails
diff --git a/save-backend/src/main/resources/META-INF/spring.factories b/save-backend/src/main/resources/META-INF/spring.factories
index 0b0542bdf6..de7dfa2be1 100644
--- a/save-backend/src/main/resources/META-INF/spring.factories
+++ b/save-backend/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-org.springframework.boot.env.EnvironmentPostProcessor=org.cqfn.save.backend.postprocessor.DockerSecretsDatabaseProcessor
\ No newline at end of file
+org.springframework.boot.env.EnvironmentPostProcessor=com.saveourtool.save.backend.postprocessor.DockerSecretsDatabaseProcessor
\ No newline at end of file
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/CloneRepoTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/CloneRepoTest.kt
similarity index 82%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/CloneRepoTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/CloneRepoTest.kt
index a53a7be153..9ac104574d 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/CloneRepoTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/CloneRepoTest.kt
@@ -1,23 +1,23 @@
-package org.cqfn.save.backend
+package com.saveourtool.save.backend
 
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.OrganizationRepository
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.domain.Jdk
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.testutils.enqueue
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.OrganizationRepository
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.domain.Jdk
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.testutils.enqueue
+import com.saveourtool.save.v1
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/DatabaseTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/DatabaseTest.kt
similarity index 76%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/DatabaseTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/DatabaseTest.kt
index 95446d74b0..b45ecdc20b 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/DatabaseTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/DatabaseTest.kt
@@ -1,12 +1,12 @@
-package org.cqfn.save.backend
-
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.backend.configs.ApplicationConfiguration
-import org.cqfn.save.backend.repository.AgentStatusRepository
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.domain.TestResultStatus
+package com.saveourtool.save.backend
+
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.backend.configs.ApplicationConfiguration
+import com.saveourtool.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.domain.TestResultStatus
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/DownloadFilesTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/DownloadFilesTest.kt
similarity index 86%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/DownloadFilesTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/DownloadFilesTest.kt
index 680fde9eaf..04713450ea 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/DownloadFilesTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/DownloadFilesTest.kt
@@ -1,21 +1,21 @@
-package org.cqfn.save.backend
-
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.backend.configs.NoopWebSecurityConfig
-import org.cqfn.save.backend.configs.WebConfig
-import org.cqfn.save.backend.controllers.DownloadFilesController
-import org.cqfn.save.backend.repository.*
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.core.result.DebugInfo
-import org.cqfn.save.core.result.Pass
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.ShortFileInfo
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.entities.Agent
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.v1
+package com.saveourtool.save.backend
+
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.configs.NoopWebSecurityConfig
+import com.saveourtool.save.backend.configs.WebConfig
+import com.saveourtool.save.backend.controllers.DownloadFilesController
+import com.saveourtool.save.backend.repository.*
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.core.result.DebugInfo
+import com.saveourtool.save.core.result.Pass
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.ShortFileInfo
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.entities.Agent
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.v1
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/AgentsControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/AgentsControllerTest.kt
similarity index 89%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/AgentsControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/AgentsControllerTest.kt
index 92bda126ce..2bf2d06409 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/AgentsControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/AgentsControllerTest.kt
@@ -1,17 +1,17 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.AgentVersion
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.AgentStatusRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.entities.AgentStatus
-import org.cqfn.save.entities.AgentStatusDto
-import org.cqfn.save.entities.AgentStatusesForExecution
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.AgentVersion
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.entities.AgentStatus
+import com.saveourtool.save.entities.AgentStatusDto
+import com.saveourtool.save.entities.AgentStatusesForExecution
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/CloningRepositoryControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/CloningRepositoryControllerTest.kt
similarity index 85%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/CloningRepositoryControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/CloningRepositoryControllerTest.kt
index 980b1d24a7..3faee62f31 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/CloningRepositoryControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/CloningRepositoryControllerTest.kt
@@ -1,23 +1,23 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.configs.ConfigProperties
-import org.cqfn.save.backend.configs.WebConfig
-import org.cqfn.save.backend.configs.WebSecurityConfig
-import org.cqfn.save.backend.controllers.CloneRepositoryController
-import org.cqfn.save.backend.repository.*
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.ExecutionService
-import org.cqfn.save.backend.service.ProjectService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.ConvertingAuthenticationManager
-import org.cqfn.save.domain.Jdk
-import org.cqfn.save.domain.toFileInfo
-import org.cqfn.save.entities.*
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.testutils.enqueue
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.configs.ConfigProperties
+import com.saveourtool.save.backend.configs.WebConfig
+import com.saveourtool.save.backend.configs.WebSecurityConfig
+import com.saveourtool.save.backend.controllers.CloneRepositoryController
+import com.saveourtool.save.backend.repository.*
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.ExecutionService
+import com.saveourtool.save.backend.service.ProjectService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.ConvertingAuthenticationManager
+import com.saveourtool.save.domain.Jdk
+import com.saveourtool.save.domain.toFileInfo
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.testutils.enqueue
+import com.saveourtool.save.v1
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/DeleteEntitiesTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/DeleteEntitiesTest.kt
similarity index 84%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/DeleteEntitiesTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/DeleteEntitiesTest.kt
index 61603d6007..c47753d772 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/DeleteEntitiesTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/DeleteEntitiesTest.kt
@@ -1,21 +1,21 @@
-package org.cqfn.save.backend.controller
+package com.saveourtool.save.backend.controller
 
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.AgentStatusRepository
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.OrganizationRepository
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.backend.utils.postJsonAndAssert
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.OrganizationStatus
-import org.cqfn.save.entities.Project
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.OrganizationRepository
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.backend.utils.postJsonAndAssert
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.OrganizationStatus
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.v1
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ExecutionControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ExecutionControllerTest.kt
similarity index 88%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ExecutionControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ExecutionControllerTest.kt
index e10ceec301..2f07eb34b8 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ExecutionControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ExecutionControllerTest.kt
@@ -1,24 +1,24 @@
-package org.cqfn.save.backend.controller
+package com.saveourtool.save.backend.controller
 
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.ExecutionRepository
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionInitializationDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.execution.ExecutionUpdateDto
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.testutils.enqueue
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.ExecutionRepository
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionInitializationDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.execution.ExecutionUpdateDto
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.testutils.enqueue
+import com.saveourtool.save.v1
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/JpaSpecificationTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/JpaSpecificationTest.kt
similarity index 79%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/JpaSpecificationTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/JpaSpecificationTest.kt
index 98317a0380..ab1a152c94 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/JpaSpecificationTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/JpaSpecificationTest.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.backend.controller
+package com.saveourtool.save.backend.controller
 
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.backend.configs.ApplicationConfiguration
-import org.cqfn.save.backend.repository.AgentStatusRepository
-import org.cqfn.save.backend.utils.MySqlExtension
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.backend.configs.ApplicationConfiguration
+import com.saveourtool.save.backend.repository.AgentStatusRepository
+import com.saveourtool.save.backend.utils.MySqlExtension
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/LnkUserOrganizationControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/LnkUserOrganizationControllerTest.kt
similarity index 90%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/LnkUserOrganizationControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/LnkUserOrganizationControllerTest.kt
index 0740c4bc96..c5354a4c38 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/LnkUserOrganizationControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/LnkUserOrganizationControllerTest.kt
@@ -1,18 +1,18 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.configs.WebSecurityConfig
-import org.cqfn.save.backend.controllers.LnkUserOrganizationController
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.service.*
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.ConvertingAuthenticationManager
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.*
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.permission.SetRoleRequest
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.configs.WebSecurityConfig
+import com.saveourtool.save.backend.controllers.LnkUserOrganizationController
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.service.*
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.ConvertingAuthenticationManager
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.permission.SetRoleRequest
+import com.saveourtool.save.v1
 import org.junit.jupiter.api.Test
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.*
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/OrganizationControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt
similarity index 82%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/OrganizationControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt
index d7f21b3bf0..8b892549a8 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/OrganizationControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/OrganizationControllerTest.kt
@@ -1,17 +1,17 @@
-package org.cqfn.save.backend.controller
+package com.saveourtool.save.backend.controller
 
-import org.cqfn.save.backend.configs.NoopWebSecurityConfig
-import org.cqfn.save.backend.controllers.OrganizationController
-import org.cqfn.save.backend.repository.*
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.service.LnkUserOrganizationService
-import org.cqfn.save.backend.service.OrganizationService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.*
-import org.cqfn.save.v1
+import com.saveourtool.save.backend.configs.NoopWebSecurityConfig
+import com.saveourtool.save.backend.controllers.OrganizationController
+import com.saveourtool.save.backend.repository.*
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.service.LnkUserOrganizationService
+import com.saveourtool.save.backend.service.OrganizationService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.v1
 
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.*
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/PermissionControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/PermissionControllerTest.kt
similarity index 90%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/PermissionControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/PermissionControllerTest.kt
index f91301edde..82df53d78a 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/PermissionControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/PermissionControllerTest.kt
@@ -1,23 +1,23 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.configs.WebSecurityConfig
-import org.cqfn.save.backend.controllers.PermissionController
-import org.cqfn.save.backend.repository.OrganizationRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.security.OrganizationPermissionEvaluator
-import org.cqfn.save.backend.security.ProjectPermissionEvaluator
-import org.cqfn.save.backend.service.*
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.ConvertingAuthenticationManager
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.OrganizationStatus
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
-import org.cqfn.save.permission.SetRoleRequest
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.configs.WebSecurityConfig
+import com.saveourtool.save.backend.controllers.PermissionController
+import com.saveourtool.save.backend.repository.OrganizationRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.security.OrganizationPermissionEvaluator
+import com.saveourtool.save.backend.security.ProjectPermissionEvaluator
+import com.saveourtool.save.backend.service.*
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.ConvertingAuthenticationManager
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.OrganizationStatus
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
+import com.saveourtool.save.permission.SetRoleRequest
+import com.saveourtool.save.v1
 import org.junit.jupiter.api.Test
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.kotlin.*
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ProjectControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ProjectControllerTest.kt
similarity index 92%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ProjectControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ProjectControllerTest.kt
index 72c618f2ee..1ee951b7eb 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/ProjectControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/ProjectControllerTest.kt
@@ -1,16 +1,16 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.repository.GitRepository
-import org.cqfn.save.backend.repository.OrganizationRepository
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.service.LnkUserProjectService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.entities.*
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.repository.GitRepository
+import com.saveourtool.save.backend.repository.OrganizationRepository
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.service.LnkUserProjectService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.v1
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestExecutionControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
similarity index 90%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestExecutionControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
index 048d20afcc..7667ff0d83 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestExecutionControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestExecutionControllerTest.kt
@@ -1,18 +1,18 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.agent.TestSuiteExecutionStatisticDto
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.AgentRepository
-import org.cqfn.save.backend.repository.TestExecutionRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.backend.utils.mutateMockedUser
-import org.cqfn.save.backend.utils.secondsToLocalDateTime
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.agent.TestSuiteExecutionStatisticDto
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.AgentRepository
+import com.saveourtool.save.backend.repository.TestExecutionRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.backend.utils.mutateMockedUser
+import com.saveourtool.save.backend.utils.secondsToLocalDateTime
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.v1
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertTrue
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestInitializeControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestInitializeControllerTest.kt
similarity index 89%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestInitializeControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestInitializeControllerTest.kt
index 90d31fb655..5181459a51 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestInitializeControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestInitializeControllerTest.kt
@@ -1,13 +1,13 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.TestRepository
-import org.cqfn.save.backend.repository.TestSuiteRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.test.TestBatch
-import org.cqfn.save.test.TestDto
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.TestRepository
+import com.saveourtool.save.backend.repository.TestSuiteRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.test.TestBatch
+import com.saveourtool.save.test.TestDto
 import org.junit.jupiter.api.Assertions.assertEquals
 
 import org.junit.jupiter.api.Assertions.assertNotNull
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestSuitesControllerTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestSuitesControllerTest.kt
similarity index 90%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestSuitesControllerTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestSuitesControllerTest.kt
index 19e7e51fed..e916c40ae2 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/controller/TestSuitesControllerTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/controller/TestSuitesControllerTest.kt
@@ -1,18 +1,18 @@
-package org.cqfn.save.backend.controller
-
-import org.cqfn.save.backend.SaveApplication
-import org.cqfn.save.backend.controllers.ProjectController
-import org.cqfn.save.backend.repository.ProjectRepository
-import org.cqfn.save.backend.repository.TestSuiteRepository
-import org.cqfn.save.backend.scheduling.StandardSuitesUpdateScheduler
-import org.cqfn.save.backend.utils.MySqlExtension
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.v1
+package com.saveourtool.save.backend.controller
+
+import com.saveourtool.save.backend.SaveApplication
+import com.saveourtool.save.backend.controllers.ProjectController
+import com.saveourtool.save.backend.repository.ProjectRepository
+import com.saveourtool.save.backend.repository.TestSuiteRepository
+import com.saveourtool.save.backend.scheduling.StandardSuitesUpdateScheduler
+import com.saveourtool.save.backend.utils.MySqlExtension
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.v1
 
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.jupiter.api.AfterAll
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/BasicSecurityTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/BasicSecurityTest.kt
similarity index 86%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/security/BasicSecurityTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/security/BasicSecurityTest.kt
index ef58b53fc6..0351c416d9 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/BasicSecurityTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/BasicSecurityTest.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.ConvertingAuthenticationManager
-import org.cqfn.save.entities.User
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.ConvertingAuthenticationManager
+import com.saveourtool.save.entities.User
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/ConverterTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ConverterTest.kt
similarity index 87%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/security/ConverterTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ConverterTest.kt
index 3849b531d9..cca0a17e64 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/ConverterTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ConverterTest.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.backend.utils.CustomAuthenticationBasicConverter
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.backend.utils.CustomAuthenticationBasicConverter
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.springframework.http.HttpHeaders
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluatorTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluatorTest.kt
similarity index 90%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluatorTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluatorTest.kt
index f85974e3cc..2db1c41883 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/OrganizationPermissionEvaluatorTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/OrganizationPermissionEvaluatorTest.kt
@@ -1,13 +1,13 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.repository.LnkUserOrganizationRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.service.LnkUserOrganizationService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.*
-import org.cqfn.save.permission.Permission
+import com.saveourtool.save.backend.repository.LnkUserOrganizationRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.service.LnkUserOrganizationService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.permission.Permission
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluatorTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluatorTest.kt
similarity index 91%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluatorTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluatorTest.kt
index 6ec4bf7997..204380011e 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/security/ProjectPermissionEvaluatorTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/security/ProjectPermissionEvaluatorTest.kt
@@ -1,15 +1,15 @@
-package org.cqfn.save.backend.security
+package com.saveourtool.save.backend.security
 
-import org.cqfn.save.backend.repository.LnkUserProjectRepository
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.backend.service.LnkUserProjectService
-import org.cqfn.save.backend.service.UserDetailsService
-import org.cqfn.save.backend.utils.AuthenticationDetails
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.LnkUserProject
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.Permission
+import com.saveourtool.save.backend.repository.LnkUserProjectRepository
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.backend.service.LnkUserProjectService
+import com.saveourtool.save.backend.service.UserDetailsService
+import com.saveourtool.save.backend.utils.AuthenticationDetails
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.LnkUserProject
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.Permission
 
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/service/PermissionServiceTest.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/service/PermissionServiceTest.kt
similarity index 92%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/service/PermissionServiceTest.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/service/PermissionServiceTest.kt
index 6bfed9b6f2..9c9fc1d7d3 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/service/PermissionServiceTest.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/service/PermissionServiceTest.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.backend.service
+package com.saveourtool.save.backend.service
 
-import org.cqfn.save.backend.repository.UserRepository
-import org.cqfn.save.domain.Role
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.User
-import org.cqfn.save.permission.SetRoleRequest
+import com.saveourtool.save.backend.repository.UserRepository
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.User
+import com.saveourtool.save.permission.SetRoleRequest
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/MySqlExtension.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/MySqlExtension.kt
similarity index 97%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/utils/MySqlExtension.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/MySqlExtension.kt
index e2d98b6a18..1f970f26ca 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/MySqlExtension.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/MySqlExtension.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import org.junit.jupiter.api.extension.BeforeAllCallback
 import org.junit.jupiter.api.extension.ExtensionContext
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/SecurityTestingUtils.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/SecurityTestingUtils.kt
similarity index 92%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/utils/SecurityTestingUtils.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/SecurityTestingUtils.kt
index 8c95c9f96b..f38bcbbcf6 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/SecurityTestingUtils.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/SecurityTestingUtils.kt
@@ -2,7 +2,7 @@
  * Utilities for testing of security-related logic
  */
 
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.context.SecurityContextHolder
diff --git a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/WebTestUtils.kt b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/WebTestUtils.kt
similarity index 94%
rename from save-backend/src/test/kotlin/org/cqfn/save/backend/utils/WebTestUtils.kt
rename to save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/WebTestUtils.kt
index 74fc33c77e..10d7a38eb8 100644
--- a/save-backend/src/test/kotlin/org/cqfn/save/backend/utils/WebTestUtils.kt
+++ b/save-backend/src/test/kotlin/com/saveourtool/save/backend/utils/WebTestUtils.kt
@@ -2,7 +2,7 @@
  * Utility methods for testing web requests
  */
 
-package org.cqfn.save.backend.utils
+package com.saveourtool.save.backend.utils
 
 import org.springframework.http.MediaType
 import org.springframework.test.web.reactive.server.WebTestClient
diff --git a/save-backend/src/test/resources/application.properties b/save-backend/src/test/resources/application.properties
index e2b103310a..0924bd25c6 100644
--- a/save-backend/src/test/resources/application.properties
+++ b/save-backend/src/test/resources/application.properties
@@ -16,9 +16,9 @@ spring.jpa.properties.hibernate.use_sql_comments=true
 spring.jpa.properties.hibernate.validator.apply_to_ddl=false
 spring.jpa.hibernate.use-new-id-generator-mappings=false
 # logging
-logging.level.org.cqfn.save.backend.service.TestService=DEBUG
-logging.level.org.cqfn.save.backend.service.TestExecutionService=DEBUG
-logging.level.org.cqfn.save.backend.controllers.internal.TestController=DEBUG
+logging.level.com.saveourtool.save.backend.service.TestService=DEBUG
+logging.level.com.saveourtool.save.backend.service.TestExecutionService=DEBUG
+logging.level.com.saveourtool.save.backend.controllers.internal.TestController=DEBUG
 logging.level.org.hibernate.SQL=DEBUG
-logging.level.org.cqfn.save.testutils.LoggingQueueDispatcher=INFO
+logging.level.com.saveourtool.save.testutils.LoggingQueueDispatcher=INFO
 logging.level.org.hibernate.type=TRACE
\ No newline at end of file
diff --git a/save-cloud-charts/save-cloud/Chart.yaml b/save-cloud-charts/save-cloud/Chart.yaml
index 885d31834a..8702e4c52b 100644
--- a/save-cloud-charts/save-cloud/Chart.yaml
+++ b/save-cloud-charts/save-cloud/Chart.yaml
@@ -4,5 +4,5 @@ description: Helm chart for SAVE Cloud service
 # todo: separate versioning of charts or aligned with project version?
 version: 0.1.0
 sources:
-  - https://github.com/analysis-dev/save-cloud
-  - https://github.com/analysis-dev/save-cli
+  - https://github.com/saveourtool/save-cloud
+  - https://github.com/saveourtool/save-cli
diff --git a/save-cloud-charts/save-cloud/templates/backend-deployment.yaml b/save-cloud-charts/save-cloud/templates/backend-deployment.yaml
index 8e062cc87a..01cdc336bc 100644
--- a/save-cloud-charts/save-cloud/templates/backend-deployment.yaml
+++ b/save-cloud-charts/save-cloud/templates/backend-deployment.yaml
@@ -44,7 +44,7 @@ spec:
             - clone
             - --single-branch
             - --
-            - https://github.com/analysis-dev/save-cloud.git
+            - https://github.com/saveourtool/save-cloud.git
             - /data
           volumeMounts:
             - mountPath: /data
diff --git a/save-cloud-charts/save-cloud/values.yaml b/save-cloud-charts/save-cloud/values.yaml
index 86846592f1..f4abebe3dc 100644
--- a/save-cloud-charts/save-cloud/values.yaml
+++ b/save-cloud-charts/save-cloud/values.yaml
@@ -1,4 +1,4 @@
-imageRegistry: ghcr.io/analysis-dev
+imageRegistry: ghcr.io/saveourtool
 dockerTag: latest  # this should be set explicitly during chart installation
 
 env: staging
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/ApiVersions.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/ApiVersions.kt
similarity index 87%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/ApiVersions.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/ApiVersions.kt
index a8b9e106e7..61aea59f7d 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/ApiVersions.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/ApiVersions.kt
@@ -4,7 +4,7 @@
 
 @file:Suppress("VARIABLE_NAME_INCORRECT", "CONSTANT_UPPERCASE", "TopLevelPropertyNaming")
 
-package org.cqfn.save
+package com.saveourtool.save
 
 const val v1 = "v1"
 const val latestVersion = v1
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentState.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentState.kt
similarity index 95%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentState.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentState.kt
index 008170b273..ec46ae9af9 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentState.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentState.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentVersion.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentVersion.kt
similarity index 86%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentVersion.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentVersion.kt
index a67828ddac..e802b52bd3 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/AgentVersion.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/AgentVersion.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/ExecutionLogs.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/ExecutionLogs.kt
similarity index 85%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/ExecutionLogs.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/ExecutionLogs.kt
index 224bf2c12e..c594d31b1b 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/ExecutionLogs.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/ExecutionLogs.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/Heartbeat.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/Heartbeat.kt
similarity index 95%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/Heartbeat.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/Heartbeat.kt
index 3746ba33b8..7cc4a0b902 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/Heartbeat.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/Heartbeat.kt
@@ -2,9 +2,9 @@
  * Model classes for heartbeating between save agent and the orchestrator
  */
 
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.test.TestDto
+import com.saveourtool.save.test.TestDto
 
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestExecutionDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestExecutionDto.kt
similarity index 91%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestExecutionDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestExecutionDto.kt
index ac5df47b22..54f142e6c9 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestExecutionDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestExecutionDto.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.domain.TestResultStatus
+import com.saveourtool.save.domain.TestResultStatus
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestSuiteExecutionStatisticDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestSuiteExecutionStatisticDto.kt
similarity index 79%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestSuiteExecutionStatisticDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestSuiteExecutionStatisticDto.kt
index e8541d5de9..40c6bd61f5 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/agent/TestSuiteExecutionStatisticDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/agent/TestSuiteExecutionStatisticDto.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.agent
+package com.saveourtool.save.agent
 
-import org.cqfn.save.domain.TestResultStatus
+import com.saveourtool.save.domain.TestResultStatus
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/FileInfo.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/FileInfo.kt
similarity index 96%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/FileInfo.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/FileInfo.kt
index a8b80e0487..85f9e96f61 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/FileInfo.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/FileInfo.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/OrganizationSaveStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/OrganizationSaveStatus.kt
similarity index 90%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/OrganizationSaveStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/OrganizationSaveStatus.kt
index 9346141db6..a8c8b407d2 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/OrganizationSaveStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/OrganizationSaveStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/ProjectSaveStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/ProjectSaveStatus.kt
similarity index 90%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/ProjectSaveStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/ProjectSaveStatus.kt
index 52e0513237..b2a1498845 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/ProjectSaveStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/ProjectSaveStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Role.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Role.kt
similarity index 96%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Role.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Role.kt
index c6b6990f7e..ec4398f50a 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Role.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Role.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/RunConfiguration.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/RunConfiguration.kt
similarity index 90%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/RunConfiguration.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/RunConfiguration.kt
index c83b5b16f4..12bda97db4 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/RunConfiguration.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/RunConfiguration.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Sdk.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Sdk.kt
similarity index 97%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Sdk.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Sdk.kt
index b7718ef872..a516e7c663 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/Sdk.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/Sdk.kt
@@ -2,7 +2,7 @@
  * SDK which are supported for test execution in save-cloud
  */
 
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultLocation.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultLocation.kt
similarity index 87%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultLocation.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultLocation.kt
index 3a16949994..f0394bf2c6 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultLocation.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultLocation.kt
@@ -2,10 +2,10 @@
  * data classes representing additional data associated with test executions
  */
 
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
-import org.cqfn.save.core.result.DebugInfo
-import org.cqfn.save.core.result.TestStatus
+import com.saveourtool.save.core.result.DebugInfo
+import com.saveourtool.save.core.result.TestStatus
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultStatus.kt
similarity index 94%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultStatus.kt
index 3e28337fd7..33d758d17d 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/domain/TestResultStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/domain/TestResultStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Annotations.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Annotations.kt
similarity index 94%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Annotations.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Annotations.kt
index 0d6f1eab90..07893594f3 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Annotations.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Annotations.kt
@@ -4,9 +4,9 @@
 
 @file:Suppress("MISSING_KDOC_TOP_LEVEL", "EMPTY_PRIMARY_CONSTRUCTOR")
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.utils.EnumType
+import com.saveourtool.save.utils.EnumType
 
 @OptIn(ExperimentalMultiplatform::class)
 @OptionalExpectation
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ExecutionRequest.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ExecutionRequest.kt
similarity index 95%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ExecutionRequest.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ExecutionRequest.kt
index 0c1e463eaa..f690505cde 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ExecutionRequest.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ExecutionRequest.kt
@@ -2,9 +2,9 @@
  * Data classes that are used to trigger execution start
  */
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.domain.Sdk
+import com.saveourtool.save.domain.Sdk
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/GitDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/GitDto.kt
similarity index 91%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/GitDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/GitDto.kt
index b9064df3b9..f603ff09cf 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/GitDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/GitDto.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/NewProjectDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/NewProjectDto.kt
similarity index 89%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/NewProjectDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/NewProjectDto.kt
index 63499f7312..2f2f6664e7 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/NewProjectDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/NewProjectDto.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Organization.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Organization.kt
similarity index 89%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Organization.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Organization.kt
index fc0624c932..184b3659dd 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Organization.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Organization.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.utils.EnumType
-import org.cqfn.save.utils.LocalDateTime
+import com.saveourtool.save.utils.EnumType
+import com.saveourtool.save.utils.LocalDateTime
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/OrganizationStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/OrganizationStatus.kt
similarity index 86%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/OrganizationStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/OrganizationStatus.kt
index 96eb6ef977..d06fa52e0a 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/OrganizationStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/OrganizationStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Project.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Project.kt
similarity index 96%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Project.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Project.kt
index fa1a38340a..6afd68ac59 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/Project.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/Project.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.utils.EnumType
+import com.saveourtool.save.utils.EnumType
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ProjectStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ProjectStatus.kt
similarity index 85%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ProjectStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ProjectStatus.kt
index ba60ba76e8..b42e0700c4 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/ProjectStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/ProjectStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/benchmarks/BenchmarkEntity.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/benchmarks/BenchmarkEntity.kt
similarity index 96%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/benchmarks/BenchmarkEntity.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/benchmarks/BenchmarkEntity.kt
index a580a20da1..056a369bb5 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/entities/benchmarks/BenchmarkEntity.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/benchmarks/BenchmarkEntity.kt
@@ -2,7 +2,7 @@
  * Common class for representing the entity used in awesome-benchamrks
  */
 
-package org.cqfn.save.entities.benchmarks
+package com.saveourtool.save.entities.benchmarks
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionDto.kt
similarity index 94%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionDto.kt
index eb39bea1a2..444f7c45c2 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionDto.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.execution
+package com.saveourtool.save.execution
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionInitializationDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionInitializationDto.kt
similarity index 89%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionInitializationDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionInitializationDto.kt
index 1d7a916513..7a3d592610 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionInitializationDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionInitializationDto.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.execution
+package com.saveourtool.save.execution
 
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Project
 import kotlinx.serialization.Serializable
 
 /**
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionStatus.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionStatus.kt
similarity index 92%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionStatus.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionStatus.kt
index d878bdc7ba..477536fab7 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionStatus.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionStatus.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.execution
+package com.saveourtool.save.execution
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionType.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionType.kt
similarity index 85%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionType.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionType.kt
index 529454e978..02c8f93806 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionType.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionType.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.execution
+package com.saveourtool.save.execution
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionUpdateDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionUpdateDto.kt
similarity index 82%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionUpdateDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionUpdateDto.kt
index e1da1ddf13..948726246e 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/execution/ExecutionUpdateDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/execution/ExecutionUpdateDto.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.execution
+package com.saveourtool.save.execution
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OauthProviderInfo.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OauthProviderInfo.kt
similarity index 92%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OauthProviderInfo.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OauthProviderInfo.kt
index 4a123bb108..9962f83cb4 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OauthProviderInfo.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OauthProviderInfo.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.info
+package com.saveourtool.save.info
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OrganizationInfo.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OrganizationInfo.kt
similarity index 84%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OrganizationInfo.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OrganizationInfo.kt
index 7aba562706..948080f018 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/OrganizationInfo.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/OrganizationInfo.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.info
+package com.saveourtool.save.info
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/UserInfo.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/UserInfo.kt
similarity index 92%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/UserInfo.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/UserInfo.kt
index b15d80b7e2..ee7082ef8f 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/info/UserInfo.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/info/UserInfo.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.info
+package com.saveourtool.save.info
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/Permission.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/Permission.kt
similarity index 75%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/Permission.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/Permission.kt
index 5be970dc2b..e2f01f2a7c 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/Permission.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/Permission.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.permission
+package com.saveourtool.save.permission
 
 /**
  * Permissions that operations may require on certain objects
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/SetRoleRequest.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/SetRoleRequest.kt
similarity index 73%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/SetRoleRequest.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/SetRoleRequest.kt
index bd869f763f..795ab6aed8 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/permission/SetRoleRequest.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/permission/SetRoleRequest.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.permission
+package com.saveourtool.save.permission
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/test/TestDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/test/TestDto.kt
similarity index 95%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/test/TestDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/test/TestDto.kt
index 76b261103c..e57e6d011a 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/test/TestDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/test/TestDto.kt
@@ -2,7 +2,7 @@
  * DTOs for retrieving test batches
  */
 
-package org.cqfn.save.test
+package com.saveourtool.save.test
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteDto.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteDto.kt
similarity index 87%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteDto.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteDto.kt
index a923bcef1d..d18f9dd730 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteDto.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteDto.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.testsuite
+package com.saveourtool.save.testsuite
 
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Project
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteType.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteType.kt
similarity index 89%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteType.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteType.kt
index cc8c5a7170..216220a441 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/testsuite/TestSuiteType.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/testsuite/TestSuiteType.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.testsuite
+package com.saveourtool.save.testsuite
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/AvatarType.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/AvatarType.kt
similarity index 86%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/AvatarType.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/AvatarType.kt
index 5e28b2f030..3065356c8c 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/AvatarType.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/AvatarType.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
similarity index 91%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
index 20f6dcdd1d..4b53555258 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
@@ -5,7 +5,7 @@
     "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE"
 )
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 expect enum class EnumType {
     /** Persist enumerated type property or field as an integer.  */
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/RoleUtils.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/RoleUtils.kt
similarity index 79%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/RoleUtils.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/RoleUtils.kt
index d4fc692b97..07e4b3bd49 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/RoleUtils.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/RoleUtils.kt
@@ -2,9 +2,9 @@
  * Utilities of Role entity
  */
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 
 /**
  * @param oneRole
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/StandardTestSuiteUtils.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/StandardTestSuiteUtils.kt
similarity index 94%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/StandardTestSuiteUtils.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/StandardTestSuiteUtils.kt
index f8e2a2d7e5..bf9db56a86 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/StandardTestSuiteUtils.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/StandardTestSuiteUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 /**
  * Directory in docker image, where all requested standard test suites will be located for execution
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/TestResultUtils.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/TestResultUtils.kt
similarity index 75%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/TestResultUtils.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/TestResultUtils.kt
index 05161e2605..2298f58de9 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/TestResultUtils.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/TestResultUtils.kt
@@ -2,18 +2,18 @@
  * Mapping entities from SAVE-core to their equivalents from SAVE-cloud
  */
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
-import org.cqfn.save.core.logging.logTrace
-import org.cqfn.save.core.result.Crash
-import org.cqfn.save.core.result.Fail
-import org.cqfn.save.core.result.Ignored
-import org.cqfn.save.core.result.Pass
-import org.cqfn.save.core.result.TestResult
-import org.cqfn.save.core.result.TestStatus
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.domain.TestResultStatus
+import com.saveourtool.save.core.logging.logTrace
+import com.saveourtool.save.core.result.Crash
+import com.saveourtool.save.core.result.Fail
+import com.saveourtool.save.core.result.Ignored
+import com.saveourtool.save.core.result.Pass
+import com.saveourtool.save.core.result.TestResult
+import com.saveourtool.save.core.result.TestStatus
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.domain.TestResultStatus
 
 /**
  * Maps `TestStatus` to `TestResultStatus`
diff --git a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/UserUtils.kt b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/UserUtils.kt
similarity index 95%
rename from save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/UserUtils.kt
rename to save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/UserUtils.kt
index 310e59bbfa..f9f96c36f5 100644
--- a/save-cloud-common/src/commonMain/kotlin/org/cqfn/save/utils/UserUtils.kt
+++ b/save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/utils/UserUtils.kt
@@ -2,7 +2,7 @@
  * Utilities of User entity
  */
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 /**
  * @param userInformation
diff --git a/save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/entities/Annotations.kt b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/entities/Annotations.kt
similarity index 86%
rename from save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/entities/Annotations.kt
rename to save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/entities/Annotations.kt
index ff1022512c..600d1661c0 100644
--- a/save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/entities/Annotations.kt
+++ b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/entities/Annotations.kt
@@ -9,6 +9,6 @@
     "MatchingDeclarationName"
 )
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 actual annotation class ForeignKey
diff --git a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/AwesomeBenchmarks.kt b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/AwesomeBenchmarks.kt
similarity index 87%
rename from save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/AwesomeBenchmarks.kt
rename to save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/AwesomeBenchmarks.kt
index d040dad522..7163da1387 100644
--- a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/AwesomeBenchmarks.kt
+++ b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/AwesomeBenchmarks.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
-import org.cqfn.save.entities.benchmarks.BenchmarkCategoryEnum
+import com.saveourtool.save.entities.benchmarks.BenchmarkCategoryEnum
 
 import kotlinx.serialization.Serializable
 
diff --git a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
similarity index 91%
rename from save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
rename to save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
index a1a4afe204..8651ac2fed 100644
--- a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
+++ b/save-cloud-common/src/jsMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("MISSING_KDOC_TOP_LEVEL", "FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 actual typealias LocalDateTime = kotlinx.datetime.LocalDateTime
 
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/TestResultLocationJvm.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/TestResultLocationJvm.kt
similarity index 81%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/TestResultLocationJvm.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/TestResultLocationJvm.kt
index a208532dbd..80c072eee5 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/TestResultLocationJvm.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/TestResultLocationJvm.kt
@@ -1,9 +1,9 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save
+package com.saveourtool.save
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.domain.TestResultLocation
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.domain.TestResultLocation
 import java.nio.file.Paths
 import kotlin.io.path.name
 
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/domain/FileInfoJvm.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/domain/FileInfoJvm.kt
similarity index 92%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/domain/FileInfoJvm.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/domain/FileInfoJvm.kt
index b7ff220c11..70652bac83 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/domain/FileInfoJvm.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/domain/FileInfoJvm.kt
@@ -2,7 +2,7 @@
  * Utils for `FileInfo` on JVM
  */
 
-package org.cqfn.save.domain
+package com.saveourtool.save.domain
 
 import java.io.File
 import java.nio.file.Path
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Agent.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Agent.kt
similarity index 93%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Agent.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Agent.kt
index e576c8d3cf..892a9fa65c 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Agent.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Agent.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import javax.persistence.Entity
 import javax.persistence.FetchType
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/AgentStatus.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/AgentStatus.kt
similarity index 94%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/AgentStatus.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/AgentStatus.kt
index 16e15f5b9d..f337bbb378 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/AgentStatus.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/AgentStatus.kt
@@ -2,9 +2,9 @@
  * Data classes for agent status
  */
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.agent.AgentState
+import com.saveourtool.save.agent.AgentState
 import java.time.LocalDateTime
 import javax.persistence.Entity
 import javax.persistence.EnumType
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Annotations.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Annotations.kt
similarity index 95%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Annotations.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Annotations.kt
index 4380ae14a6..c123d401c2 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Annotations.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Annotations.kt
@@ -2,7 +2,7 @@
  * This file contains actual annotation from Spring data jpa
  */
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import javax.persistence.Entity
 import javax.persistence.Enumerated
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/BaseEntity.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/BaseEntity.kt
similarity index 90%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/BaseEntity.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/BaseEntity.kt
index 61e194e30a..20b4ff0926 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/BaseEntity.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/BaseEntity.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import javax.persistence.GeneratedValue
 import javax.persistence.Id
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Execution.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Execution.kt
similarity index 93%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Execution.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Execution.kt
index 6ec4e28837..aaeb4d0804 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Execution.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Execution.kt
@@ -1,9 +1,9 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.domain.Sdk
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionType
+import com.saveourtool.save.domain.Sdk
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionType
 import java.time.LocalDateTime
 import java.time.ZoneOffset
 import javax.persistence.Entity
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Git.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Git.kt
similarity index 95%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Git.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Git.kt
index 8bd91cfc1b..1278d62ee5 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Git.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Git.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 import javax.persistence.Entity
 import javax.persistence.JoinColumn
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserOrganization.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserOrganization.kt
similarity index 87%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserOrganization.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserOrganization.kt
index 3a92851d7d..b58ae99d00 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserOrganization.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserOrganization.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 import javax.persistence.*
 import javax.persistence.Entity
 import javax.persistence.Enumerated
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserProject.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserProject.kt
similarity index 86%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserProject.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserProject.kt
index 0e94e8ef2f..d71a16b4d2 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/LnkUserProject.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/LnkUserProject.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.domain.Role
+import com.saveourtool.save.domain.Role
 import javax.persistence.*
 import javax.persistence.Entity
 import javax.persistence.Enumerated
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Test.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Test.kt
similarity index 92%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Test.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Test.kt
index 268dbabc22..eab3351149 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/Test.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/Test.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.test.TestDto
+import com.saveourtool.save.test.TestDto
 import java.time.LocalDateTime
 import javax.persistence.Entity
 import javax.persistence.JoinColumn
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestExecution.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestExecution.kt
similarity index 92%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestExecution.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestExecution.kt
index 4ca97bf792..a56d924bb6 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestExecution.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestExecution.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.domain.TestResultStatus
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.domain.TestResultStatus
 
 import java.time.LocalDateTime
 import java.time.ZoneOffset
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestSuite.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestSuite.kt
similarity index 91%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestSuite.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestSuite.kt
index 549e475328..35c4fd6763 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/TestSuite.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/TestSuite.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
 
 import java.time.LocalDateTime
 import javax.persistence.Entity
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/User.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/User.kt
similarity index 91%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/User.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/User.kt
index 6ead1c7404..1e9dfcc756 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/User.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/User.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.info.UserInfo
 import javax.persistence.Entity
 
 /**
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/benchmarks/AwesomeBenchmarks.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/benchmarks/AwesomeBenchmarks.kt
similarity index 89%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/benchmarks/AwesomeBenchmarks.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/benchmarks/AwesomeBenchmarks.kt
index f05a907c2f..12b551edc6 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/entities/benchmarks/AwesomeBenchmarks.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/entities/benchmarks/AwesomeBenchmarks.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.entities.benchmarks
+package com.saveourtool.save.entities.benchmarks
 
-import org.cqfn.save.entities.BaseEntity
-import org.cqfn.save.entities.Entity
+import com.saveourtool.save.entities.BaseEntity
+import com.saveourtool.save.entities.Entity
 import javax.persistence.EnumType
 import javax.persistence.Enumerated
 
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/exceptions/BackendInternalException.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/exceptions/BackendInternalException.kt
similarity index 81%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/exceptions/BackendInternalException.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/exceptions/BackendInternalException.kt
index 484f849bd2..5805cb10e8 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/exceptions/BackendInternalException.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/exceptions/BackendInternalException.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.exceptions
+package com.saveourtool.save.exceptions
 
 import java.lang.Exception
 
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
similarity index 84%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
index d93d0cc5ed..054afe0a7a 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
@@ -2,7 +2,7 @@
  * This file contains actual classes from jvmMain
  */
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import javax.persistence.EnumType
 
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/FileUtils.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/FileUtils.kt
similarity index 95%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/FileUtils.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/FileUtils.kt
index 7b0322157e..8d4bbb8203 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/FileUtils.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/FileUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import java.io.File
 import java.io.FileNotFoundException
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetails.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetails.kt
similarity index 94%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetails.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetails.kt
index edd1996d31..4f3d9fdd77 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetails.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetails.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import org.springframework.security.core.authority.SimpleGrantedAuthority
 import org.springframework.security.core.userdetails.User
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetailsMixin.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetailsMixin.kt
similarity index 93%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetailsMixin.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetailsMixin.kt
index 66eb13c9d6..d0745a3588 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/IdentitySourceAwareUserDetailsMixin.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/IdentitySourceAwareUserDetailsMixin.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
diff --git a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/LocalDateTimeSerializer.kt b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/LocalDateTimeSerializer.kt
similarity index 96%
rename from save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/LocalDateTimeSerializer.kt
rename to save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/LocalDateTimeSerializer.kt
index 1559a3c909..b3683e05cb 100644
--- a/save-cloud-common/src/jvmMain/kotlin/org/cqfn/save/utils/LocalDateTimeSerializer.kt
+++ b/save-cloud-common/src/jvmMain/kotlin/com/saveourtool/save/utils/LocalDateTimeSerializer.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 import java.time.LocalDateTime
 
diff --git a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/entities/Annotations.kt b/save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/entities/Annotations.kt
similarity index 86%
rename from save-cloud-common/src/jsMain/kotlin/org/cqfn/save/entities/Annotations.kt
rename to save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/entities/Annotations.kt
index ff1022512c..600d1661c0 100644
--- a/save-cloud-common/src/jsMain/kotlin/org/cqfn/save/entities/Annotations.kt
+++ b/save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/entities/Annotations.kt
@@ -9,6 +9,6 @@
     "MatchingDeclarationName"
 )
 
-package org.cqfn.save.entities
+package com.saveourtool.save.entities
 
 actual annotation class ForeignKey
diff --git a/save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/utils/EntitiesUtils.kt b/save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
similarity index 91%
rename from save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
rename to save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
index a1a4afe204..8651ac2fed 100644
--- a/save-cloud-common/src/linuxX64Main/kotlin/org/cqfn/save/utils/EntitiesUtils.kt
+++ b/save-cloud-common/src/linuxX64Main/kotlin/com/saveourtool/save/utils/EntitiesUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("MISSING_KDOC_TOP_LEVEL", "FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.utils
+package com.saveourtool.save.utils
 
 actual typealias LocalDateTime = kotlinx.datetime.LocalDateTime
 
diff --git a/save-deploy/README.md b/save-deploy/README.md
index 0748b99f1c..da2cdfae38 100644
--- a/save-deploy/README.md
+++ b/save-deploy/README.md
@@ -106,5 +106,5 @@ File `save-deploy/reverse-proxy.conf` should be copied to `/etc/nginx/sites-avai
 # Adding a new service
 Sometimes it's necessary to create a new service. These steps are required to seamlessly add it to deployment:
 * Add it to [docker-compose.yaml.template](../docker-compose.yaml.template)
-* Add it to task `depoyDockerStack` in [`DockerStackConfiguration.kt`](../buildSrc/src/main/kotlin/org/cqfn/save/buildutils/DockerStackConfiguration.kt)
+* Add it to task `depoyDockerStack` in [`DockerStackConfiguration.kt`](../buildSrc/src/main/kotlin/com/saveourtool/save/buildutils/DockerStackConfiguration.kt)
   so that config directory is created (if it's another Spring Boot service)
diff --git a/save-frontend/build.gradle.kts b/save-frontend/build.gradle.kts
index 19143ec20e..80097948ad 100644
--- a/save-frontend/build.gradle.kts
+++ b/save-frontend/build.gradle.kts
@@ -32,9 +32,9 @@ kotlin {
         browser {
             repositories {
                 mavenCentral()
-                maven("https://oss.sonatype.org/content/repositories/snapshots") {
+                maven("https://s01.oss.sonatype.org/content/repositories/snapshots") {
                     content {
-                        includeGroup("org.cqfn.save")
+                        includeGroup("com.saveourtool.save")
                     }
                 }
             }
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/App.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt
similarity index 91%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/App.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt
index 9b02e8669e..27b9f5da30 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/App.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/App.kt
@@ -2,24 +2,24 @@
  * Main entrypoint for SAVE frontend
  */
 
-package org.cqfn.save.frontend
+package com.saveourtool.save.frontend
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.frontend.components.Footer
-import org.cqfn.save.frontend.components.basic.scrollToTopButton
-import org.cqfn.save.frontend.components.errorModalHandler
-import org.cqfn.save.frontend.components.topBar
-import org.cqfn.save.frontend.components.views.*
-import org.cqfn.save.frontend.components.views.usersettingsview.UserSettingsEmailMenuView
-import org.cqfn.save.frontend.components.views.usersettingsview.UserSettingsOrganizationsMenuView
-import org.cqfn.save.frontend.components.views.usersettingsview.UserSettingsProfileMenuView
-import org.cqfn.save.frontend.components.views.usersettingsview.UserSettingsTokenMenuView
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.externals.modal.ReactModal
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.v1
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.frontend.components.Footer
+import com.saveourtool.save.frontend.components.basic.scrollToTopButton
+import com.saveourtool.save.frontend.components.errorModalHandler
+import com.saveourtool.save.frontend.components.topBar
+import com.saveourtool.save.frontend.components.views.*
+import com.saveourtool.save.frontend.components.views.usersettingsview.UserSettingsEmailMenuView
+import com.saveourtool.save.frontend.components.views.usersettingsview.UserSettingsOrganizationsMenuView
+import com.saveourtool.save.frontend.components.views.usersettingsview.UserSettingsProfileMenuView
+import com.saveourtool.save.frontend.components.views.usersettingsview.UserSettingsTokenMenuView
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.externals.modal.ReactModal
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.v1
 
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.url.URLSearchParams
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/Footer.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/Footer.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/Footer.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/Footer.kt
index 35d2cc8973..3a6f238c79 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/Footer.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/Footer.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.components
+package com.saveourtool.save.frontend.components
 
 import generated.SAVE_VERSION
 import react.Props
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/HasErrorModal.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/HasErrorModal.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt
index dfb877a1cc..fb65ee4983 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/HasErrorModal.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/HasErrorModal.kt
@@ -1,8 +1,8 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.components
+package com.saveourtool.save.frontend.components
 
-import org.cqfn.save.frontend.externals.modal.modal
+import com.saveourtool.save.frontend.externals.modal.modal
 
 import csstype.ClassName
 import org.w3c.fetch.Response
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/TopBar.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/TopBar.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/TopBar.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/TopBar.kt
index 616417d97a..af211ca234 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/TopBar.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/TopBar.kt
@@ -4,12 +4,12 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "WildcardImport")
 
-package org.cqfn.save.frontend.components
+package com.saveourtool.save.frontend.components
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.frontend.components.modal.logoutModal
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.frontend.components.modal.logoutModal
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.info.UserInfo
 
 import csstype.Width
 import csstype.rem
@@ -130,7 +130,7 @@ fun topBar() = fc<TopBarProps> { props ->
                     attrs["style"] = jso<CSSProperties> {
                         width = 8.rem
                     }.unsafeCast<Width>()
-                    attrs.href = "https://github.com/analysis-dev/save"
+                    attrs.href = "https://github.com/saveourtool/save"
                     +"SAVE format"
                 }
             }
@@ -139,7 +139,7 @@ fun topBar() = fc<TopBarProps> { props ->
                     attrs["style"] = jso<CSSProperties> {
                         width = 9.rem
                     }.unsafeCast<Width>()
-                    attrs.href = "https://github.com/analysis-dev/save-cloud"
+                    attrs.href = "https://github.com/saveourtool/save-cloud"
                     +"SAVE on GitHub"
                 }
             }
@@ -157,7 +157,7 @@ fun topBar() = fc<TopBarProps> { props ->
                     attrs["style"] = jso<CSSProperties> {
                         width = 6.rem
                     }.unsafeCast<Width>()
-                    attrs.href = "https://github.com/analysis-dev/save-cloud"
+                    attrs.href = "https://github.com/saveourtool/save-cloud"
                     i("fa fa-user opacity-6 text-dark me-1") {
                         attrs["aria-hidden"] = "true"
                     }
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/Card.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Card.kt
similarity index 91%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/Card.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Card.kt
index 8b68e9b0dd..6a2b8b9e3e 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/Card.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/Card.kt
@@ -4,9 +4,9 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 
 import react.PropsWithChildren
 import react.dom.RDOMBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/CheckBoxGrid.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/CheckBoxGrid.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/CheckBoxGrid.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/CheckBoxGrid.kt
index 53d7ad22c8..ae96836552 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/CheckBoxGrid.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/CheckBoxGrid.kt
@@ -4,11 +4,11 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "WildcardImport")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.frontend.externals.fontawesome.faQuestionCircle
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.testsuite.TestSuiteDto
+import com.saveourtool.save.frontend.externals.fontawesome.faQuestionCircle
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.testsuite.TestSuiteDto
 
 import react.PropsWithChildren
 import react.dom.*
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ExecutionStatistics.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ExecutionStatistics.kt
similarity index 97%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ExecutionStatistics.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ExecutionStatistics.kt
index 7dabba75ab..51ae5251c9 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ExecutionStatistics.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ExecutionStatistics.kt
@@ -1,9 +1,9 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "WildcardImport")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionStatus
 
 import csstype.Width
 import react.CSSProperties
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FileUploader.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FileUploader.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FileUploader.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FileUploader.kt
index 8eebe9031c..4b2d706ce7 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FileUploader.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FileUploader.kt
@@ -4,15 +4,15 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.components.basic
-
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.frontend.externals.fontawesome.faFile
-import org.cqfn.save.frontend.externals.fontawesome.faTimesCircle
-import org.cqfn.save.frontend.externals.fontawesome.faUpload
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.frontend.utils.ConfirmationType
-import org.cqfn.save.frontend.utils.toPrettyString
+package com.saveourtool.save.frontend.components.basic
+
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.frontend.externals.fontawesome.faFile
+import com.saveourtool.save.frontend.externals.fontawesome.faTimesCircle
+import com.saveourtool.save.frontend.externals.fontawesome.faUpload
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.utils.ConfirmationType
+import com.saveourtool.save.frontend.utils.toPrettyString
 
 import csstype.Width
 import org.w3c.dom.HTMLInputElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FiltersRow.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FiltersRow.kt
similarity index 88%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FiltersRow.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FiltersRow.kt
index 8f21a6ab1d..8605971b30 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/FiltersRow.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/FiltersRow.kt
@@ -1,12 +1,12 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE", "FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.frontend.components.basic.SelectOption.Companion.ANY
-import org.cqfn.save.frontend.externals.fontawesome.faFilter
-import org.cqfn.save.frontend.externals.fontawesome.faSearch
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.frontend.components.basic.SelectOption.Companion.ANY
+import com.saveourtool.save.frontend.externals.fontawesome.faFilter
+import com.saveourtool.save.frontend.externals.fontawesome.faSearch
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLSelectElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/HtmlElements.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/HtmlElements.kt
similarity index 83%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/HtmlElements.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/HtmlElements.kt
index 770cc47585..61c0007b0c 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/HtmlElements.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/HtmlElements.kt
@@ -2,9 +2,9 @@
  * File that contains html elements that are used multiple times in the project
  */
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.Project
+import com.saveourtool.save.entities.Project
 
 import csstype.BorderRadius
 import react.CSSProperties
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/InputForms.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/InputForms.kt
similarity index 98%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/InputForms.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/InputForms.kt
index 86db2dbb60..59983306b6 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/InputForms.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/InputForms.kt
@@ -1,6 +1,6 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
 import org.w3c.dom.events.Event
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ManageUserRoleCard.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ManageUserRoleCard.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ManageUserRoleCard.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ManageUserRoleCard.kt
index 8b93a314b2..8476f93087 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ManageUserRoleCard.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ManageUserRoleCard.kt
@@ -4,15 +4,15 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.externals.lodash.debounce
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.permission.SetRoleRequest
-import org.cqfn.save.utils.getHighestRole
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.externals.lodash.debounce
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.permission.SetRoleRequest
+import com.saveourtool.save.utils.getHighestRole
 
 import csstype.None
 import org.w3c.dom.HTMLInputElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/OrganizationSettingsMenu.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/OrganizationSettingsMenu.kt
similarity index 97%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/OrganizationSettingsMenu.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/OrganizationSettingsMenu.kt
index 6fd9a832d2..b531546595 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/OrganizationSettingsMenu.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/OrganizationSettingsMenu.kt
@@ -1,8 +1,8 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "LargeClass")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.info.UserInfo
 
 import org.w3c.fetch.Response
 import react.*
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectInfo.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectInfo.kt
similarity index 91%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectInfo.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectInfo.kt
index ca084b68aa..c6a5094f8b 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectInfo.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectInfo.kt
@@ -4,12 +4,12 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.Project
-import org.cqfn.save.frontend.externals.fontawesome.faCheck
-import org.cqfn.save.frontend.externals.fontawesome.faTimesCircle
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.frontend.externals.fontawesome.faCheck
+import com.saveourtool.save.frontend.externals.fontawesome.faTimesCircle
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 
 import csstype.ClassName
 import react.FC
@@ -99,7 +99,7 @@ fun projectInfo(
                             this.id = fieldId
                             value = text ?: ""
                             disabled = if (fieldId == "name") {
-                                // temporary workaround for https://github.com/analysis-dev/save-cloud/issues/589#issuecomment-1049674021
+                                // temporary workaround for https://github.com/saveourtool/save-cloud/issues/589#issuecomment-1049674021
                                 true
                             } else {
                                 props.isEditDisabled ?: true
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectSettingsMenu.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectSettingsMenu.kt
similarity index 98%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectSettingsMenu.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectSettingsMenu.kt
index c779f893b4..cdd7bbc7e6 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectSettingsMenu.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectSettingsMenu.kt
@@ -1,9 +1,9 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "LargeClass")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.Project
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.info.UserInfo
 
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLSelectElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectStatisticMenu.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectStatisticMenu.kt
similarity index 86%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectStatisticMenu.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectStatisticMenu.kt
index ec64c2ac4a..72e4cb01cf 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ProjectStatisticMenu.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ProjectStatisticMenu.kt
@@ -1,18 +1,18 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "FILE_WILDCARD_IMPORTS", "LargeClass")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.agent.TestSuiteExecutionStatisticDto
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.frontend.components.tables.tableComponent
-import org.cqfn.save.frontend.externals.chart.DataPieChart
-import org.cqfn.save.frontend.externals.chart.pieChart
-import org.cqfn.save.frontend.externals.chart.randomColor
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.get
-import org.cqfn.save.frontend.utils.unsafeMap
-import org.cqfn.save.frontend.utils.useRequest
+import com.saveourtool.save.agent.TestSuiteExecutionStatisticDto
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.frontend.components.tables.tableComponent
+import com.saveourtool.save.frontend.externals.chart.DataPieChart
+import com.saveourtool.save.frontend.externals.chart.pieChart
+import com.saveourtool.save.frontend.externals.chart.randomColor
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.get
+import com.saveourtool.save.frontend.utils.unsafeMap
+import com.saveourtool.save.frontend.utils.useRequest
 import org.w3c.fetch.Headers
 import react.*
 import react.dom.div
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ScrollToTopButton.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ScrollToTopButton.kt
similarity index 88%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ScrollToTopButton.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ScrollToTopButton.kt
index 870d019722..0f0504fdf8 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/ScrollToTopButton.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/ScrollToTopButton.kt
@@ -2,9 +2,9 @@
  * Scroll-to-top button component
  */
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 
 import org.w3c.dom.SMOOTH
 import org.w3c.dom.ScrollBehavior
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SdkSelection.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SdkSelection.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SdkSelection.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SdkSelection.kt
index bd31e13684..1b02268c67 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SdkSelection.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SdkSelection.kt
@@ -4,10 +4,10 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "WildcardImport", "FILE_WILDCARD_IMPORTS")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.domain.getSdkVersions
-import org.cqfn.save.domain.sdks
+import com.saveourtool.save.domain.getSdkVersions
+import com.saveourtool.save.domain.sdks
 
 import org.w3c.dom.HTMLSelectElement
 import react.PropsWithChildren
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SelectForm.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SelectForm.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SelectForm.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SelectForm.kt
index 8a85d3d5de..30ef72b513 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SelectForm.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SelectForm.kt
@@ -1,9 +1,9 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.frontend.utils.*
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.frontend.utils.*
 
 import org.w3c.dom.events.Event
 import org.w3c.fetch.Headers
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SuiteDescription.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SuiteDescription.kt
similarity index 84%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SuiteDescription.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SuiteDescription.kt
index 1e47853706..647ccdc059 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/SuiteDescription.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/SuiteDescription.kt
@@ -1,8 +1,8 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteDto
 
 /**
  * Create a piece of HTML with formatted representation of test suite
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestResourcesSelection.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestResourcesSelection.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestResourcesSelection.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestResourcesSelection.kt
index a39fa9a36f..35e963d406 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestResourcesSelection.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestResourcesSelection.kt
@@ -4,13 +4,13 @@
 
 @file:Suppress("WildcardImport", "FILE_WILDCARD_IMPORTS")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.frontend.components.views.ProjectView
-import org.cqfn.save.frontend.externals.fontawesome.faQuestionCircle
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.testsuite.TestSuiteDto
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.frontend.components.views.ProjectView
+import com.saveourtool.save.frontend.externals.fontawesome.faQuestionCircle
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.testsuite.TestSuiteDto
 
 import org.w3c.dom.events.Event
 import react.PropsWithChildren
@@ -142,7 +142,7 @@ fun testResourcesSelection(
                                 attrs["popover-title"] =
                                         "Use the following link to read more about save format:"
                                 attrs["popover-content"] =
-                                        "<a href =\"https://github.com/cqfn/save/blob/main/README.md\" > SAVE core README </a>"
+                                        "<a href =\"https://github.com/saveourtool/save-cli/blob/main/README.md\" > SAVE core README </a>"
                                 attrs["data-trigger"] = "focus"
                                 attrs["tabindex"] = "0"
                             }
@@ -260,7 +260,7 @@ fun testResourcesSelection(
                         setExecCmd
                     )
                     val toolTipTextForBatchSize = "Batch size controls how many files will be processed at the same time." +
-                            " To know more about batch size, please visit: https://github.com/analysis-dev/save."
+                            " To know more about batch size, please visit: https://github.com/saveourtool/save."
                     setAdditionalPropertiesForStandardMode(
                         props.batchSizeForAnalyzer,
                         "",
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestStatusComponent.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestStatusComponent.kt
similarity index 81%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestStatusComponent.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestStatusComponent.kt
index d3e9a87666..0a39dca814 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/basic/TestStatusComponent.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TestStatusComponent.kt
@@ -1,15 +1,15 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.core.result.Crash
-import org.cqfn.save.core.result.Fail
-import org.cqfn.save.core.result.Ignored
-import org.cqfn.save.core.result.Pass
-import org.cqfn.save.core.result.TestStatus
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.frontend.externals.fontawesome.faExternalLinkAlt
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.core.result.Crash
+import com.saveourtool.save.core.result.Fail
+import com.saveourtool.save.core.result.Ignored
+import com.saveourtool.save.core.result.Pass
+import com.saveourtool.save.core.result.TestStatus
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.frontend.externals.fontawesome.faExternalLinkAlt
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
 
 import okio.Path.Companion.toPath
 import react.Props
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/ErrorModal.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/ErrorModal.kt
similarity index 89%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/ErrorModal.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/ErrorModal.kt
index 2a4c52db2b..afd63831d8 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/ErrorModal.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/ErrorModal.kt
@@ -2,10 +2,10 @@
  * A component to display an error message in a modal view
  */
 
-package org.cqfn.save.frontend.components.modal
+package com.saveourtool.save.frontend.components.modal
 
-import org.cqfn.save.frontend.externals.modal.ModalProps
-import org.cqfn.save.frontend.externals.modal.modal
+import com.saveourtool.save.frontend.externals.modal.ModalProps
+import com.saveourtool.save.frontend.externals.modal.modal
 
 import react.RBuilder
 import react.RHandler
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/LogoutModal.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/LogoutModal.kt
similarity index 90%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/LogoutModal.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/LogoutModal.kt
index 67a6f8e81c..de5b80b2d7 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/modal/LogoutModal.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/modal/LogoutModal.kt
@@ -2,13 +2,13 @@
  * A component for logout modal window
  */
 
-package org.cqfn.save.frontend.components.modal
+package com.saveourtool.save.frontend.components.modal
 
-import org.cqfn.save.frontend.externals.modal.ModalProps
-import org.cqfn.save.frontend.externals.modal.modal
-import org.cqfn.save.frontend.utils.post
-import org.cqfn.save.frontend.utils.spread
-import org.cqfn.save.frontend.utils.useRequest
+import com.saveourtool.save.frontend.externals.modal.ModalProps
+import com.saveourtool.save.frontend.externals.modal.modal
+import com.saveourtool.save.frontend.utils.post
+import com.saveourtool.save.frontend.utils.spread
+import com.saveourtool.save.frontend.utils.useRequest
 
 import csstype.ClassName
 import org.w3c.fetch.Headers
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/PagingControl.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/PagingControl.kt
similarity index 99%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/PagingControl.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/PagingControl.kt
index b6e191fab3..469c53f20f 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/PagingControl.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/PagingControl.kt
@@ -2,7 +2,7 @@
  * Paging control utils
  */
 
-package org.cqfn.save.frontend.components.tables
+package com.saveourtool.save.frontend.components.tables
 
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.HTMLSelectElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/TableComponent.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/TableComponent.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt
index 81e2aefedc..7853075154 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/tables/TableComponent.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/tables/TableComponent.kt
@@ -4,13 +4,13 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.frontend.components.tables
+package com.saveourtool.save.frontend.components.tables
 
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.components.modal.errorModal
-import org.cqfn.save.frontend.http.HttpStatusException
-import org.cqfn.save.frontend.utils.WithRequestStatusContext
-import org.cqfn.save.frontend.utils.spread
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.components.modal.errorModal
+import com.saveourtool.save.frontend.http.HttpStatusException
+import com.saveourtool.save.frontend.utils.WithRequestStatusContext
+import com.saveourtool.save.frontend.utils.spread
 
 import react.Props
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AbstractView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AbstractView.kt
similarity index 93%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AbstractView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AbstractView.kt
index 04922ee260..8f935ea30b 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AbstractView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AbstractView.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.frontend.utils.ComponentWithScope
+import com.saveourtool.save.frontend.utils.ComponentWithScope
 
 import react.Props
 import react.State
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AwesomeBenchmarksView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AwesomeBenchmarksView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt
index 02ab394333..abe54569dd 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/AwesomeBenchmarksView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/AwesomeBenchmarksView.kt
@@ -4,13 +4,13 @@
 
 @file:Suppress("MAGIC_NUMBER", "WildcardImport", "FILE_WILDCARD_IMPORTS")
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.entities.benchmarks.BenchmarkCategoryEnum
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.utils.AwesomeBenchmarks
+import com.saveourtool.save.entities.benchmarks.BenchmarkCategoryEnum
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.utils.AwesomeBenchmarks
 
 import csstype.Height
 import csstype.Width
@@ -85,7 +85,7 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                             }
                                         }
                                         p("card-text mb-auto") { +"Checkout updates and new benchmarks." }
-                                        a(href = "https://github.com/analysis-dev/awesome-benchmarks/pulls") {
+                                        a(href = "https://github.com/saveourtool/awesome-benchmarks/pulls") {
                                             +"Check the GitHub"
                                         }
                                     }
@@ -113,10 +113,10 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                             }
                                         }
                                         p("card-text mb-auto") { +"Checkout latest news about SAVE project." }
-                                        a(href = "https://github.com/analysis-dev/save-cloud") {
+                                        a(href = "https://github.com/saveourtool/save-cloud") {
                                             +"SAVE-cloud "
                                         }
-                                        a(href = "https://github.com/analysis-dev/save") {
+                                        a(href = "https://github.com/saveourtool/save") {
                                             +" SAVE-cli"
                                         }
                                     }
@@ -271,7 +271,7 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                 p {
                                     +"""As a group of enthusiasts who create """
 
-                                    a("https://github.com/analysis-dev/") {
+                                    a("https://github.com/saveourtool/") {
                                         +"""dev-tools"""
                                     }
 
@@ -280,7 +280,7 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                             
                                             So we decided to create this """
 
-                                    a("https://github.com/analysis-dev/awesome-benchmarks") {
+                                    a("https://github.com/saveourtool/awesome-benchmarks") {
                                         +"""curated list of standards, tests and benchmarks"""
                                     }
 
@@ -310,7 +310,7 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                     li {
                                         fontAwesomeIcon(icon = faGithub)
                                         +""" Go to the"""
-                                        a("https://github.com/analysis-dev/awesome-benchmarks") {
+                                        a("https://github.com/saveourtool/awesome-benchmarks") {
                                             +""" awesome-benchmarks """
                                         }
                                         +"""repository"""
@@ -326,7 +326,7 @@ class AwesomeBenchmarksView : AbstractView<PropsWithChildren, AwesomeBenchmarksS
                                     li {
                                         fontAwesomeIcon(icon = faFolderOpen)
                                         +""" Add your benchmark to"""
-                                        a("https://github.com/analysis-dev/awesome-benchmarks/tree/main/benchmarks") {
+                                        a("https://github.com/saveourtool/awesome-benchmarks/tree/main/benchmarks") {
                                             +""" benchmarks """
                                         }
                                         +"""dir"""
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CollectionView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CollectionView.kt
similarity index 85%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CollectionView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CollectionView.kt
index f51d40f43b..59e89fc743 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CollectionView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CollectionView.kt
@@ -1,16 +1,16 @@
 @file:Suppress("FILE_WILDCARD_IMPORTS", "WildcardImport", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.entities.Project
-import org.cqfn.save.frontend.components.basic.privacySpan
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.components.tables.tableComponent
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.get
-import org.cqfn.save.frontend.utils.unsafeMap
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.frontend.components.basic.privacySpan
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.components.tables.tableComponent
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.get
+import com.saveourtool.save.frontend.utils.unsafeMap
+import com.saveourtool.save.info.UserInfo
 
 import org.w3c.fetch.Headers
 import org.w3c.fetch.Response
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreateOrganizationView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreateOrganizationView.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreateOrganizationView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreateOrganizationView.kt
index 0d2895244a..e585de7936 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreateOrganizationView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreateOrganizationView.kt
@@ -4,12 +4,12 @@
 
 @file:Suppress("WildcardImport", "FILE_WILDCARD_IMPORTS")
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.entities.*
-import org.cqfn.save.frontend.components.basic.InputTypes
-import org.cqfn.save.frontend.components.basic.inputTextFormRequired
-import org.cqfn.save.frontend.utils.*
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.frontend.components.basic.InputTypes
+import com.saveourtool.save.frontend.components.basic.inputTextFormRequired
+import com.saveourtool.save.frontend.utils.*
 
 import org.w3c.dom.HTMLInputElement
 import org.w3c.dom.events.Event
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreationView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreationView.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreationView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreationView.kt
index f85571fe1c..995d198671 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/CreationView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/CreationView.kt
@@ -5,18 +5,18 @@
 
 @file:Suppress("WildcardImport", "FILE_WILDCARD_IMPORTS")
 
-package org.cqfn.save.frontend.components.views
-
-import org.cqfn.save.entities.*
-import org.cqfn.save.frontend.components.basic.*
-import org.cqfn.save.frontend.components.basic.InputTypes
-import org.cqfn.save.frontend.components.basic.inputTextFormOptional
-import org.cqfn.save.frontend.components.basic.inputTextFormRequired
-import org.cqfn.save.frontend.components.basic.selectFormRequired
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.externals.fontawesome.faQuestionCircle
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.frontend.utils.*
+package com.saveourtool.save.frontend.components.views
+
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.frontend.components.basic.*
+import com.saveourtool.save.frontend.components.basic.InputTypes
+import com.saveourtool.save.frontend.components.basic.inputTextFormOptional
+import com.saveourtool.save.frontend.components.basic.inputTextFormRequired
+import com.saveourtool.save.frontend.components.basic.selectFormRequired
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.externals.fontawesome.faQuestionCircle
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.utils.*
 
 import org.w3c.dom.*
 import org.w3c.dom.events.Event
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ExecutionView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ExecutionView.kt
similarity index 90%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ExecutionView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ExecutionView.kt
index 5cba478398..824c305fdd 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ExecutionView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ExecutionView.kt
@@ -2,31 +2,31 @@
  * View for displaying individual execution results
  */
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.frontend.components.basic.SelectOption.Companion.ANY
-import org.cqfn.save.frontend.components.basic.executionStatistics
-import org.cqfn.save.frontend.components.basic.executionTestsNotFound
-import org.cqfn.save.frontend.components.basic.testExecutionFiltersRow
-import org.cqfn.save.frontend.components.basic.testStatusComponent
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.components.tables.tableComponent
-import org.cqfn.save.frontend.externals.fontawesome.faRedo
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.frontend.externals.table.useFilters
-import org.cqfn.save.frontend.http.getDebugInfoFor
-import org.cqfn.save.frontend.themes.Colors
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.get
-import org.cqfn.save.frontend.utils.post
-import org.cqfn.save.frontend.utils.spread
-import org.cqfn.save.frontend.utils.unsafeMap
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.frontend.components.basic.SelectOption.Companion.ANY
+import com.saveourtool.save.frontend.components.basic.executionStatistics
+import com.saveourtool.save.frontend.components.basic.executionTestsNotFound
+import com.saveourtool.save.frontend.components.basic.testExecutionFiltersRow
+import com.saveourtool.save.frontend.components.basic.testStatusComponent
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.components.tables.tableComponent
+import com.saveourtool.save.frontend.externals.fontawesome.faRedo
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.externals.table.useFilters
+import com.saveourtool.save.frontend.http.getDebugInfoFor
+import com.saveourtool.save.frontend.themes.Colors
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.get
+import com.saveourtool.save.frontend.utils.post
+import com.saveourtool.save.frontend.utils.spread
+import com.saveourtool.save.frontend.utils.unsafeMap
 
 import csstype.Background
 import csstype.TextDecoration
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/FallbackView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt
similarity index 93%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/FallbackView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt
index da515109fa..2aceac2dbe 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/FallbackView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/FallbackView.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
 import react.PropsWithChildren
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/HistoryView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/HistoryView.kt
similarity index 92%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/HistoryView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/HistoryView.kt
index 0978169ffc..39fb90ed8d 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/HistoryView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/HistoryView.kt
@@ -2,20 +2,20 @@
  * View for tests execution history
  */
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.components.tables.tableComponent
-import org.cqfn.save.frontend.externals.fontawesome.faCheck
-import org.cqfn.save.frontend.externals.fontawesome.faExclamationTriangle
-import org.cqfn.save.frontend.externals.fontawesome.faSpinner
-import org.cqfn.save.frontend.externals.fontawesome.faTrashAlt
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.frontend.themes.Colors
-import org.cqfn.save.frontend.utils.*
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.components.tables.tableComponent
+import com.saveourtool.save.frontend.externals.fontawesome.faCheck
+import com.saveourtool.save.frontend.externals.fontawesome.faExclamationTriangle
+import com.saveourtool.save.frontend.externals.fontawesome.faSpinner
+import com.saveourtool.save.frontend.externals.fontawesome.faTrashAlt
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.themes.Colors
+import com.saveourtool.save.frontend.utils.*
 
 import csstype.Background
 import org.w3c.fetch.Headers
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/OrganizationView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/OrganizationView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt
index 491dc7387c..3b1978559d 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/OrganizationView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt
@@ -2,25 +2,25 @@
  * A view with organization details
  */
 
-package org.cqfn.save.frontend.components.views
-
-import org.cqfn.save.domain.ImageInfo
-import org.cqfn.save.domain.Role
-import org.cqfn.save.domain.moreOrEqualThan
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.OrganizationStatus
-import org.cqfn.save.entities.Project
-import org.cqfn.save.frontend.components.basic.organizationSettingsMenu
-import org.cqfn.save.frontend.components.basic.privacySpan
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.components.tables.tableComponent
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.http.getOrganization
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.utils.AvatarType
-import org.cqfn.save.utils.getHighestRole
-import org.cqfn.save.v1
+package com.saveourtool.save.frontend.components.views
+
+import com.saveourtool.save.domain.ImageInfo
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.domain.moreOrEqualThan
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.OrganizationStatus
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.frontend.components.basic.organizationSettingsMenu
+import com.saveourtool.save.frontend.components.basic.privacySpan
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.components.tables.tableComponent
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.http.getOrganization
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.utils.AvatarType
+import com.saveourtool.save.utils.getHighestRole
+import com.saveourtool.save.v1
 
 import csstype.*
 import org.w3c.dom.HTMLInputElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ProjectView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ProjectView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt
index 25a326c885..dfdb97c790 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/ProjectView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/ProjectView.kt
@@ -4,31 +4,31 @@
 
 @file:Suppress("WildcardImport", "FILE_WILDCARD_IMPORTS", "LargeClass")
 
-package org.cqfn.save.frontend.components.views
-
-import org.cqfn.save.domain.*
-import org.cqfn.save.entities.*
-import org.cqfn.save.execution.ExecutionDto
-import org.cqfn.save.frontend.components.basic.TestingType
-import org.cqfn.save.frontend.components.basic.cardComponent
-import org.cqfn.save.frontend.components.basic.fileUploader
-import org.cqfn.save.frontend.components.basic.privacySpan
-import org.cqfn.save.frontend.components.basic.projectInfo
-import org.cqfn.save.frontend.components.basic.projectSettingsMenu
-import org.cqfn.save.frontend.components.basic.projectStatisticMenu
-import org.cqfn.save.frontend.components.basic.sdkSelection
-import org.cqfn.save.frontend.components.basic.testResourcesSelection
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.externals.fontawesome.faCalendarAlt
-import org.cqfn.save.frontend.externals.fontawesome.faEdit
-import org.cqfn.save.frontend.externals.fontawesome.faHistory
-import org.cqfn.save.frontend.externals.fontawesome.fontAwesomeIcon
-import org.cqfn.save.frontend.externals.modal.modal
-import org.cqfn.save.frontend.http.getProject
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.frontend.utils.noopResponseHandler
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.testsuite.TestSuiteDto
+package com.saveourtool.save.frontend.components.views
+
+import com.saveourtool.save.domain.*
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.execution.ExecutionDto
+import com.saveourtool.save.frontend.components.basic.TestingType
+import com.saveourtool.save.frontend.components.basic.cardComponent
+import com.saveourtool.save.frontend.components.basic.fileUploader
+import com.saveourtool.save.frontend.components.basic.privacySpan
+import com.saveourtool.save.frontend.components.basic.projectInfo
+import com.saveourtool.save.frontend.components.basic.projectSettingsMenu
+import com.saveourtool.save.frontend.components.basic.projectStatisticMenu
+import com.saveourtool.save.frontend.components.basic.sdkSelection
+import com.saveourtool.save.frontend.components.basic.testResourcesSelection
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.externals.fontawesome.faCalendarAlt
+import com.saveourtool.save.frontend.externals.fontawesome.faEdit
+import com.saveourtool.save.frontend.externals.fontawesome.faHistory
+import com.saveourtool.save.frontend.externals.fontawesome.fontAwesomeIcon
+import com.saveourtool.save.frontend.externals.modal.modal
+import com.saveourtool.save.frontend.http.getProject
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.frontend.utils.noopResponseHandler
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.testsuite.TestSuiteDto
 
 import org.w3c.dom.HTMLButtonElement
 import org.w3c.dom.HTMLInputElement
@@ -903,12 +903,12 @@ class ProjectView : AbstractView<ProjectExecutionRouteProps, ProjectViewState>(f
         RStatics<ProjectExecutionRouteProps, ProjectViewState, ProjectView, Context<StateSetter<Response?>>>(ProjectView::class) {
         const val TEST_ROOT_DIR_HINT = """
             The path you are providing should be relative to the root directory of your repository.
-            This directory should contain <a href = "https://github.com/analysis-dev/save#how-to-configure"> save.properties </a>
-            or <a href = "https://github.com/analysis-dev/save#-savetoml-configuration-file">save.toml</a> files.
+            This directory should contain <a href = "https://github.com/saveourtool/save#how-to-configure"> save.properties </a>
+            or <a href = "https://github.com/saveourtool/save-cli#-savetoml-configuration-file">save.toml</a> files.
             For example, if the URL to your repo with tests is: 
-            <a href ="https://github.com/analysis-dev/save/">https://github.com/analysis-dev/save</a>, then
+            <a href ="https://github.com/saveourtool/save-cli/">https://github.com/saveourtool/save</a>, then
             you need to specify the following directory with 'save.toml': 
-            <a href ="https://github.com/analysis-dev/save/tree/main/examples/kotlin-diktat">examples/kotlin-diktat/</a>.
+            <a href ="https://github.com/saveourtool/save-cli/tree/main/examples/kotlin-diktat">examples/kotlin-diktat/</a>.
  
             Please note, that the tested tool and it's resources will be copied to this directory before the run.
             """
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/TestExecutionDetailsView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/TestExecutionDetailsView.kt
similarity index 82%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/TestExecutionDetailsView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/TestExecutionDetailsView.kt
index ed9fa0771e..429d4f05d5 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/TestExecutionDetailsView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/TestExecutionDetailsView.kt
@@ -1,20 +1,20 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.core.result.Crash
-import org.cqfn.save.core.result.Fail
-import org.cqfn.save.core.result.Ignored
-import org.cqfn.save.core.result.Pass
-import org.cqfn.save.domain.TestResultDebugInfo
-import org.cqfn.save.domain.TestResultLocation
-import org.cqfn.save.frontend.http.getDebugInfoFor
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.multilineText
-import org.cqfn.save.frontend.utils.multilineTextWithIndices
-import org.cqfn.save.frontend.utils.post
-import org.cqfn.save.frontend.utils.useRequest
+import com.saveourtool.save.core.result.Crash
+import com.saveourtool.save.core.result.Fail
+import com.saveourtool.save.core.result.Ignored
+import com.saveourtool.save.core.result.Pass
+import com.saveourtool.save.domain.TestResultDebugInfo
+import com.saveourtool.save.domain.TestResultLocation
+import com.saveourtool.save.frontend.http.getDebugInfoFor
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.multilineText
+import com.saveourtool.save.frontend.utils.multilineTextWithIndices
+import com.saveourtool.save.frontend.utils.post
+import com.saveourtool.save.frontend.utils.useRequest
 
 import org.w3c.fetch.Headers
 import react.Props
@@ -114,7 +114,7 @@ fun testExecutionDetailsView() = fc<Props> {
     val (status, setStatus) = useState("Loading...")
     val (testResultDebugInfo, setTestResultDebugInfo) = useState<TestResultDebugInfo?>(null)
 
-    // fixme: after https://github.com/analysis-dev/save-cloud/issues/364 can be passed via history state to avoid requests
+    // fixme: after https://github.com/saveourtool/save-cloud/issues/364 can be passed via history state to avoid requests
     useRequest(arrayOf(status, testResultDebugInfo, executionId, testResultLocation), isDeferred = false) {
         val testExecutionDtoResponse = post(
             "$apiUrl/testExecutions?executionId=$executionId&checkDebugInfo=true",
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/WelcomeView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/WelcomeView.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/WelcomeView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/WelcomeView.kt
index dcc5971a82..2aa47943ee 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/WelcomeView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/WelcomeView.kt
@@ -4,15 +4,15 @@
 
 @file:Suppress("FILE_WILDCARD_IMPORTS", "WildcardImport")
 
-package org.cqfn.save.frontend.components.views
+package com.saveourtool.save.frontend.components.views
 
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.get
-import org.cqfn.save.frontend.utils.noopResponseHandler
-import org.cqfn.save.info.OauthProviderInfo
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.get
+import com.saveourtool.save.frontend.utils.noopResponseHandler
+import com.saveourtool.save.info.OauthProviderInfo
+import com.saveourtool.save.info.UserInfo
 
 import csstype.Display
 import csstype.FontSize
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt
similarity index 89%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt
index 32d2d7ec2d..a2ec5d6b0b 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsEmailMenuView.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.frontend.components.views.usersettingsview
+package com.saveourtool.save.frontend.components.views.usersettingsview
 
-import org.cqfn.save.frontend.components.basic.InputTypes
-import org.cqfn.save.frontend.components.basic.cardComponent
+import com.saveourtool.save.frontend.components.basic.InputTypes
+import com.saveourtool.save.frontend.components.basic.cardComponent
 
 import react.FC
 import react.dom.*
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt
similarity index 90%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt
index 147b8b5905..385efab823 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsOrganizationsMenuView.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.frontend.components.views.usersettingsview
+package com.saveourtool.save.frontend.components.views.usersettingsview
 
-import org.cqfn.save.domain.Role
-import org.cqfn.save.frontend.components.basic.cardComponent
-import org.cqfn.save.v1
+import com.saveourtool.save.domain.Role
+import com.saveourtool.save.frontend.components.basic.cardComponent
+import com.saveourtool.save.v1
 
 import react.FC
 import react.dom.*
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt
index 7717e77d46..d7cc1539ce 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsProfileMenuView.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.frontend.components.views.usersettingsview
+package com.saveourtool.save.frontend.components.views.usersettingsview
 
-import org.cqfn.save.frontend.components.basic.InputTypes
-import org.cqfn.save.frontend.components.basic.cardComponent
+import com.saveourtool.save.frontend.components.basic.InputTypes
+import com.saveourtool.save.frontend.components.basic.cardComponent
 
 import react.FC
 import react.dom.*
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt
similarity index 90%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt
index f2e4d9c35c..31511e619a 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsTokenMenuView.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.frontend.components.views.usersettingsview
+package com.saveourtool.save.frontend.components.views.usersettingsview
 
-import org.cqfn.save.frontend.components.basic.cardComponent
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.post
+import com.saveourtool.save.frontend.components.basic.cardComponent
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.post
 
 import kotlinext.js.assign
 import org.w3c.fetch.Headers
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsView.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsView.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsView.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsView.kt
index 703727ea15..1713ebd975 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/components/views/usersettingsview/UserSettingsView.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/usersettingsview/UserSettingsView.kt
@@ -2,18 +2,18 @@
  * A view with settings user
  */
 
-package org.cqfn.save.frontend.components.views.usersettingsview
+package com.saveourtool.save.frontend.components.views.usersettingsview
 
-import org.cqfn.save.domain.ImageInfo
-import org.cqfn.save.frontend.components.basic.InputTypes
-import org.cqfn.save.frontend.components.views.AbstractView
-import org.cqfn.save.frontend.externals.fontawesome.*
-import org.cqfn.save.frontend.http.getUser
-import org.cqfn.save.frontend.utils.*
-import org.cqfn.save.info.OrganizationInfo
-import org.cqfn.save.info.UserInfo
-import org.cqfn.save.utils.AvatarType
-import org.cqfn.save.v1
+import com.saveourtool.save.domain.ImageInfo
+import com.saveourtool.save.frontend.components.basic.InputTypes
+import com.saveourtool.save.frontend.components.views.AbstractView
+import com.saveourtool.save.frontend.externals.fontawesome.*
+import com.saveourtool.save.frontend.http.getUser
+import com.saveourtool.save.frontend.utils.*
+import com.saveourtool.save.info.OrganizationInfo
+import com.saveourtool.save.info.UserInfo
+import com.saveourtool.save.utils.AvatarType
+import com.saveourtool.save.v1
 
 import csstype.*
 import org.w3c.dom.HTMLInputElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChart.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChart.kt
similarity index 85%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChart.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChart.kt
index 2164e0d72a..2bb4448c74 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChart.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChart.kt
@@ -1,7 +1,7 @@
 @file:JsModule("react-minimal-pie-chart")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals.chart
+package com.saveourtool.save.frontend.externals.chart
 
 import react.Component
 import react.ReactElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartBuilder.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartBuilder.kt
similarity index 93%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartBuilder.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartBuilder.kt
index 7d6a28e91b..ddff7dd29a 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartBuilder.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartBuilder.kt
@@ -2,7 +2,7 @@
  * kotlin-react builders for PieChart components
  */
 
-package org.cqfn.save.frontend.externals.chart
+package com.saveourtool.save.frontend.externals.chart
 
 import react.RBuilder
 import react.RHandler
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartProps.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartProps.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartProps.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartProps.kt
index b6102e86be..032aae79b7 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/chart/PieChartProps.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/chart/PieChartProps.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.externals.chart
+package com.saveourtool.save.frontend.externals.chart
 
 import org.w3c.dom.events.Event
 import react.PropsWithChildren
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/BrandIcons.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/BrandIcons.kt
similarity index 73%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/BrandIcons.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/BrandIcons.kt
index 395449a918..61d837433c 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/BrandIcons.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/BrandIcons.kt
@@ -5,6 +5,6 @@
 @file:JsModule("@fortawesome/free-brands-svg-icons")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 external val faGithub: dynamic
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FaSetup.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FaSetup.kt
similarity index 72%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FaSetup.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FaSetup.kt
index 3ebb015818..74c477e861 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FaSetup.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FaSetup.kt
@@ -5,6 +5,6 @@
 @file:JsModule("@fortawesome/fontawesome-svg-core")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 external val library: dynamic
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIcon.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIcon.kt
similarity index 85%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIcon.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIcon.kt
index fa8330834a..28aec009f0 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIcon.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIcon.kt
@@ -1,7 +1,7 @@
 @file:JsModule("@fortawesome/react-fontawesome")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 import react.Component
 import react.ReactElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt
index 4a5bced392..1246239459 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconBuilders.kt
@@ -2,7 +2,7 @@
  * kotlin-react builders for FontAwesomeIcon components
  */
 
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 import react.ChildrenBuilder
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt
similarity index 85%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt
index bc4230d234..3a55836ad7 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/FontAwesomeIconProps.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 import react.PropsWithChildren
 
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/Icons.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/Icons.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/Icons.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/Icons.kt
index 4e44989e8d..33ecd1c012 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/fontawesome/Icons.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/fontawesome/Icons.kt
@@ -5,7 +5,7 @@
 @file:JsModule("@fortawesome/free-solid-svg-icons")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals.fontawesome
+package com.saveourtool.save.frontend.externals.fontawesome
 
 external val fas: dynamic
 external val faUser: dynamic
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/lodash/Debounce.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/lodash/Debounce.kt
similarity index 85%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/lodash/Debounce.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/lodash/Debounce.kt
index c6c31b7b57..f85a4cf287 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/lodash/Debounce.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/lodash/Debounce.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.externals.lodash
+package com.saveourtool.save.frontend.externals.lodash
 
 /**
  * @param function to be debounced
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Imports.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Imports.kt
similarity index 98%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Imports.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Imports.kt
index 94f97b006c..05255f021b 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Imports.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Imports.kt
@@ -4,7 +4,7 @@
 
 @file:Suppress("USE_DATA_CLASS")
 
-package org.cqfn.save.frontend.externals.modal
+package com.saveourtool.save.frontend.externals.modal
 
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Modal.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Modal.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Modal.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Modal.kt
index 02b16ca33d..91a81a73b8 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/modal/Modal.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/modal/Modal.kt
@@ -2,7 +2,7 @@
  * Kotlin/JS-React wrapper for react-modal: kotlin bindings
  */
 
-package org.cqfn.save.frontend.externals.modal
+package com.saveourtool.save.frontend.externals.modal
 
 import react.ChildrenBuilder
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/table/ReactTable.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/table/ReactTable.kt
similarity index 76%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/table/ReactTable.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/table/ReactTable.kt
index c962214d99..69476be2f1 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/externals/table/ReactTable.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/externals/table/ReactTable.kt
@@ -2,7 +2,7 @@
 @file:JsNonModule
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.frontend.externals.table
+package com.saveourtool.save.frontend.externals.table
 
 import react.table.PluginHook
 
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Exceptions.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Exceptions.kt
similarity index 90%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Exceptions.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Exceptions.kt
index 0469b37812..f21e0f640b 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Exceptions.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Exceptions.kt
@@ -4,7 +4,7 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.http
+package com.saveourtool.save.frontend.http
 
 /**
  * Exception class for HTTP responses until we use a dedicated HTTP client
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Requests.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Requests.kt
similarity index 79%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Requests.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Requests.kt
index 535766215f..746a9c58c6 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/http/Requests.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/http/Requests.kt
@@ -2,17 +2,17 @@
  * Methods to make specific requests to backend
  */
 
-package org.cqfn.save.frontend.http
+package com.saveourtool.save.frontend.http
 
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.entities.Project
-import org.cqfn.save.frontend.utils.WithRequestStatusContext
-import org.cqfn.save.frontend.utils.apiUrl
-import org.cqfn.save.frontend.utils.decodeFromJsonString
-import org.cqfn.save.frontend.utils.get
-import org.cqfn.save.frontend.utils.post
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.frontend.utils.WithRequestStatusContext
+import com.saveourtool.save.frontend.utils.apiUrl
+import com.saveourtool.save.frontend.utils.decodeFromJsonString
+import com.saveourtool.save.frontend.utils.get
+import com.saveourtool.save.frontend.utils.post
+import com.saveourtool.save.info.UserInfo
 
 import org.w3c.fetch.Headers
 import org.w3c.fetch.Response
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/themes/Colors.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/themes/Colors.kt
similarity index 86%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/themes/Colors.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/themes/Colors.kt
index 1346ba1c82..1cd1362b53 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/themes/Colors.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/themes/Colors.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.themes
+package com.saveourtool.save.frontend.themes
 
 /**
  * @property value - string with the color in rgb
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ComponentWithScope.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ComponentWithScope.kt
similarity index 94%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ComponentWithScope.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ComponentWithScope.kt
index d5b8f1ede1..c54c9ca4e5 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ComponentWithScope.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ComponentWithScope.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
 import react.Props
 import react.RComponent
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/JsUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/JsUtils.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/JsUtils.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/JsUtils.kt
index c180aaa3e8..a3598415ff 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/JsUtils.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/JsUtils.kt
@@ -2,7 +2,7 @@
  * Utilities for kotlin-js interop
  */
 
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
 import react.dom.RDOMBuilder
 
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/OrganizationMenuBar.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/OrganizationMenuBar.kt
similarity index 77%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/OrganizationMenuBar.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/OrganizationMenuBar.kt
index 9e3ec2a8e5..aa228c2a03 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/OrganizationMenuBar.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/OrganizationMenuBar.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
 /**
  * A value for project menu.
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ProjectMenuBar.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ProjectMenuBar.kt
similarity index 77%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ProjectMenuBar.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ProjectMenuBar.kt
index 5b3b585e9e..0480551471 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/ProjectMenuBar.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/ProjectMenuBar.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
 /**
  * A value for project menu.
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RBuilderUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RBuilderUtils.kt
similarity index 95%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RBuilderUtils.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RBuilderUtils.kt
index 601c2ea5d6..2b39c93057 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RBuilderUtils.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RBuilderUtils.kt
@@ -4,9 +4,9 @@
 
 @file:Suppress("FILE_NAME_INCORRECT", "FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
-import org.cqfn.save.frontend.externals.modal.modal
+import com.saveourtool.save.frontend.externals.modal.modal
 
 import org.w3c.dom.events.Event
 import react.RBuilder
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RequestUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt
similarity index 97%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RequestUtils.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt
index acb21d1564..f143d09729 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RequestUtils.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RequestUtils.kt
@@ -4,11 +4,11 @@
 
 @file:Suppress("FILE_NAME_MATCH_CLASS")
 
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
-import org.cqfn.save.frontend.components.errorStatusContext
-import org.cqfn.save.frontend.http.HttpStatusException
-import org.cqfn.save.v1
+import com.saveourtool.save.frontend.components.errorStatusContext
+import com.saveourtool.save.frontend.http.HttpStatusException
+import com.saveourtool.save.v1
 
 import org.w3c.fetch.Headers
 import org.w3c.fetch.RequestCredentials
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RouterUtils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt
similarity index 93%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RouterUtils.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt
index 608c8934a2..f6bfa0bafc 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/RouterUtils.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/RouterUtils.kt
@@ -2,7 +2,7 @@
  * Utilities to work with react-router
  */
 
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
 import history.Location
 import react.Props
diff --git a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/Utils.kt b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/Utils.kt
similarity index 96%
rename from save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/Utils.kt
rename to save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/Utils.kt
index 476e8f5dc4..691dd0cc7f 100644
--- a/save-frontend/src/main/kotlin/org/cqfn/save/frontend/utils/Utils.kt
+++ b/save-frontend/src/main/kotlin/com/saveourtool/save/frontend/utils/Utils.kt
@@ -2,9 +2,9 @@
  * Various utils for frontend
  */
 
-package org.cqfn.save.frontend.utils
+package com.saveourtool.save.frontend.utils
 
-import org.cqfn.save.domain.FileInfo
+import com.saveourtool.save.domain.FileInfo
 
 import org.w3c.files.Blob
 import org.w3c.files.BlobPropertyBag
diff --git a/save-frontend/src/main/resources/error.html b/save-frontend/src/main/resources/error.html
index 38e5388a31..1452f87c27 100644
--- a/save-frontend/src/main/resources/error.html
+++ b/save-frontend/src/main/resources/error.html
@@ -24,7 +24,7 @@
     <div class="text-center">
         <div class="error mx-auto" data-text="Error">Error</div>
         <p class="lead text-gray-800 mb-5">Something went wrong on our side. Please try again later or report this issue
-            on <a href="https://github.com/analysis-dev/save-cloud/issues">our github</a>.</p>
+            on <a href="https://github.com/saveourtool/save-cloud/issues">our github</a>.</p>
     </div>
 </div>
 
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/AppTest.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/AppTest.kt
similarity index 72%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/AppTest.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/AppTest.kt
index 04f8ed09da..deafbb1099 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/AppTest.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/AppTest.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.frontend
+package com.saveourtool.save.frontend
 
-import org.cqfn.save.frontend.externals.findByTextAndCast
-import org.cqfn.save.frontend.externals.render
-import org.cqfn.save.frontend.externals.screen
+import com.saveourtool.save.frontend.externals.findByTextAndCast
+import com.saveourtool.save.frontend.externals.render
+import com.saveourtool.save.frontend.externals.screen
 import org.w3c.dom.HTMLHeadingElement
 import react.create
 import react.react
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/FooterTest.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/FooterTest.kt
similarity index 77%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/FooterTest.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/FooterTest.kt
index b183fbf5c1..7e661bfc34 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/FooterTest.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/FooterTest.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.frontend.components
+package com.saveourtool.save.frontend.components
 
-import org.cqfn.save.frontend.externals.render
-import org.cqfn.save.frontend.externals.screen
+import com.saveourtool.save.frontend.externals.render
+import com.saveourtool.save.frontend.externals.screen
 
 import generated.SAVE_VERSION
 import react.createElement
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/TopBarTest.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/TopBarTest.kt
similarity index 93%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/TopBarTest.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/TopBarTest.kt
index 0eef44452e..aa803b3ecc 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/TopBarTest.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/TopBarTest.kt
@@ -1,7 +1,7 @@
-package org.cqfn.save.frontend.components
+package com.saveourtool.save.frontend.components
 
-import org.cqfn.save.frontend.externals.*
-import org.cqfn.save.info.UserInfo
+import com.saveourtool.save.frontend.externals.*
+import com.saveourtool.save.info.UserInfo
 
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLSpanElement
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/basic/SelectFormTest.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/basic/SelectFormTest.kt
similarity index 91%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/basic/SelectFormTest.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/basic/SelectFormTest.kt
index 1443ae5179..a3aceeaa12 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/components/basic/SelectFormTest.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/components/basic/SelectFormTest.kt
@@ -1,8 +1,8 @@
-package org.cqfn.save.frontend.components.basic
+package com.saveourtool.save.frontend.components.basic
 
-import org.cqfn.save.entities.Organization
-import org.cqfn.save.frontend.externals.*
-import org.cqfn.save.frontend.utils.apiUrl
+import com.saveourtool.save.entities.Organization
+import com.saveourtool.save.frontend.externals.*
+import com.saveourtool.save.frontend.utils.apiUrl
 import org.w3c.dom.HTMLDivElement
 import org.w3c.dom.HTMLOptionElement
 import org.w3c.dom.HTMLSelectElement
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/MockServiceWorker.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/MockServiceWorker.kt
similarity index 91%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/MockServiceWorker.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/MockServiceWorker.kt
index c5cde90ca3..05ce93522c 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/MockServiceWorker.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/MockServiceWorker.kt
@@ -11,7 +11,7 @@
     "KDOC_NO_EMPTY_TAGS",
 )
 
-package org.cqfn.save.frontend.externals
+package com.saveourtool.save.frontend.externals
 
 external val rest: dynamic
 
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/ReactTestingLibrary.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/ReactTestingLibrary.kt
similarity index 96%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/ReactTestingLibrary.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/ReactTestingLibrary.kt
index db5d10c89b..0ac409edc2 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/ReactTestingLibrary.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/ReactTestingLibrary.kt
@@ -15,7 +15,7 @@
     "KDOC_WITHOUT_RETURN_TAG",
 )
 
-package org.cqfn.save.frontend.externals
+package com.saveourtool.save.frontend.externals
 
 import org.w3c.dom.HTMLElement
 import react.Props
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/UserEvent.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/UserEvent.kt
similarity index 82%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/UserEvent.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/UserEvent.kt
index 3155e09c54..bdf6e671c6 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/UserEvent.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/UserEvent.kt
@@ -6,7 +6,7 @@
 @file:JsModule("@testing-library/user-event")
 @file:JsNonModule
 
-package org.cqfn.save.frontend.externals
+package com.saveourtool.save.frontend.externals
 
 @JsName("default")
 external val userEvent: dynamic
diff --git a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/Utils.kt b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/Utils.kt
similarity index 95%
rename from save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/Utils.kt
rename to save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/Utils.kt
index 0559bb3fb5..4f886fbe8f 100644
--- a/save-frontend/src/test/kotlin/org/cqfn/save/frontend/externals/Utils.kt
+++ b/save-frontend/src/test/kotlin/com/saveourtool/save/frontend/externals/Utils.kt
@@ -10,7 +10,7 @@
     "KDOC_WITHOUT_RETURN_TAG",
 )
 
-package org.cqfn.save.frontend.externals
+package com.saveourtool.save.frontend.externals
 
 import org.w3c.dom.HTMLElement
 
diff --git a/save-orchestrator/build.gradle.kts b/save-orchestrator/build.gradle.kts
index 97dfd55a88..05e6e47ccd 100644
--- a/save-orchestrator/build.gradle.kts
+++ b/save-orchestrator/build.gradle.kts
@@ -1,7 +1,7 @@
-import org.cqfn.save.buildutils.configureJacoco
-import org.cqfn.save.buildutils.configureSpringBoot
-import org.cqfn.save.buildutils.pathToSaveCliVersion
-import org.cqfn.save.buildutils.readSaveCliVersion
+import com.saveourtool.save.buildutils.configureJacoco
+import com.saveourtool.save.buildutils.configureSpringBoot
+import com.saveourtool.save.buildutils.pathToSaveCliVersion
+import com.saveourtool.save.buildutils.readSaveCliVersion
 
 import de.undercouch.gradle.tasks.download.Download
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
@@ -34,7 +34,7 @@ val downloadSaveCliTaskProvider: TaskProvider<Download> = tasks.register<Downloa
 
     src(KotlinClosure0(function = {
         val saveCliVersion = readSaveCliVersion()
-        "https://github.com/analysis-dev/save/releases/download/v$saveCliVersion/save-$saveCliVersion-linuxX64.kexe"
+        "https://github.com/saveourtool/save-cli/releases/download/v$saveCliVersion/save-$saveCliVersion-linuxX64.kexe"
     }))
     dest("$buildDir/resources/main")
     overwrite(false)
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/LinuxUtils.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/LinuxUtils.kt
similarity index 97%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/LinuxUtils.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/LinuxUtils.kt
index 12773faa1a..8606dce900 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/LinuxUtils.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/LinuxUtils.kt
@@ -2,7 +2,7 @@
  * Utilities for working with Linux
  */
 
-package org.cqfn.save.orchestrator
+package com.saveourtool.save.orchestrator
 
 import java.io.File
 import java.io.FileNotFoundException
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/SaveOrchestrator.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/SaveOrchestrator.kt
similarity index 87%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/SaveOrchestrator.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/SaveOrchestrator.kt
index 6955b26af7..a6ca94f590 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/SaveOrchestrator.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/SaveOrchestrator.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.orchestrator
+package com.saveourtool.save.orchestrator
 
-import org.cqfn.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.config.ConfigProperties
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/Utils.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/Utils.kt
similarity index 97%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/Utils.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/Utils.kt
index fd1f0b2767..784d3fa9d5 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/Utils.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/Utils.kt
@@ -2,9 +2,9 @@
  * Utilities for orchestrator
  */
 
-package org.cqfn.save.orchestrator
+package com.saveourtool.save.orchestrator
 
-import org.cqfn.save.orchestrator.config.AgentSettings
+import com.saveourtool.save.orchestrator.config.AgentSettings
 
 import com.github.dockerjava.api.async.ResultCallback
 import com.github.dockerjava.api.command.AsyncDockerCmd
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/Beans.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/Beans.kt
similarity index 91%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/Beans.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/Beans.kt
index a7edbf2f93..f3e1aae500 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/Beans.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/Beans.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.orchestrator.config
+package com.saveourtool.save.orchestrator.config
 
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/ConfigProperties.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/ConfigProperties.kt
similarity index 98%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/ConfigProperties.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/ConfigProperties.kt
index 20373db483..40e86a10f9 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/ConfigProperties.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/ConfigProperties.kt
@@ -2,7 +2,7 @@
  * Classes for configuration properties of orchestrator
  */
 
-package org.cqfn.save.orchestrator.config
+package com.saveourtool.save.orchestrator.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/LocalDateTimeConfig.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/LocalDateTimeConfig.kt
similarity index 94%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/LocalDateTimeConfig.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/LocalDateTimeConfig.kt
index 3306b6c511..6d5b0192bc 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/config/LocalDateTimeConfig.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/config/LocalDateTimeConfig.kt
@@ -4,9 +4,9 @@
     "MISSING_KDOC_ON_FUNCTION",
 )
 
-package org.cqfn.save.orchestrator.config
+package com.saveourtool.save.orchestrator.config
 
-import org.cqfn.save.utils.LocalDateTimeSerializer
+import com.saveourtool.save.utils.LocalDateTimeSerializer
 
 import com.fasterxml.jackson.databind.SerializationFeature
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/AgentsController.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/AgentsController.kt
similarity index 90%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/AgentsController.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/AgentsController.kt
index 4c695bac85..0c1a5ce322 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/AgentsController.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/AgentsController.kt
@@ -1,15 +1,15 @@
-package org.cqfn.save.orchestrator.controller
+package com.saveourtool.save.orchestrator.controller
 
-import org.cqfn.save.agent.ExecutionLogs
-import org.cqfn.save.entities.Agent
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.orchestrator.BodilessResponseEntity
-import org.cqfn.save.orchestrator.config.ConfigProperties
-import org.cqfn.save.orchestrator.service.AgentService
-import org.cqfn.save.orchestrator.service.DockerService
-import org.cqfn.save.orchestrator.service.imageName
-import org.cqfn.save.testsuite.TestSuiteDto
+import com.saveourtool.save.agent.ExecutionLogs
+import com.saveourtool.save.entities.Agent
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.orchestrator.BodilessResponseEntity
+import com.saveourtool.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.service.AgentService
+import com.saveourtool.save.orchestrator.service.DockerService
+import com.saveourtool.save.orchestrator.service.imageName
+import com.saveourtool.save.testsuite.TestSuiteDto
 
 import com.github.dockerjava.api.exception.DockerException
 import org.slf4j.LoggerFactory
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/HeartbeatController.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/HeartbeatController.kt
similarity index 94%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/HeartbeatController.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/HeartbeatController.kt
index 90d8545944..e863b29abb 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/controller/HeartbeatController.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/controller/HeartbeatController.kt
@@ -2,17 +2,17 @@
  * Heartbeat controller and corresponding logic which accepts heartbeat and depending on the state it returns the needed response
  */
 
-package org.cqfn.save.orchestrator.controller
-
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.ContinueResponse
-import org.cqfn.save.agent.Heartbeat
-import org.cqfn.save.agent.HeartbeatResponse
-import org.cqfn.save.agent.WaitResponse
-import org.cqfn.save.entities.AgentStatusDto
-import org.cqfn.save.orchestrator.config.ConfigProperties
-import org.cqfn.save.orchestrator.service.AgentService
-import org.cqfn.save.orchestrator.service.DockerService
+package com.saveourtool.save.orchestrator.controller
+
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.ContinueResponse
+import com.saveourtool.save.agent.Heartbeat
+import com.saveourtool.save.agent.HeartbeatResponse
+import com.saveourtool.save.agent.WaitResponse
+import com.saveourtool.save.entities.AgentStatusDto
+import com.saveourtool.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.service.AgentService
+import com.saveourtool.save.orchestrator.service.DockerService
 
 import org.slf4j.LoggerFactory
 import org.springframework.context.annotation.PropertySource
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/docker/ContainerManager.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManager.kt
similarity index 95%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/docker/ContainerManager.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManager.kt
index ba07c94217..108968d308 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/docker/ContainerManager.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManager.kt
@@ -1,11 +1,11 @@
-package org.cqfn.save.orchestrator.docker
+package com.saveourtool.save.orchestrator.docker
 
-import org.cqfn.save.domain.Sdk
-import org.cqfn.save.orchestrator.DOCKER_METRIC_PREFIX
-import org.cqfn.save.orchestrator.config.DockerSettings
-import org.cqfn.save.orchestrator.copyRecursivelyWithAttributes
-import org.cqfn.save.orchestrator.execTimed
-import org.cqfn.save.orchestrator.getHostIp
+import com.saveourtool.save.domain.Sdk
+import com.saveourtool.save.orchestrator.DOCKER_METRIC_PREFIX
+import com.saveourtool.save.orchestrator.config.DockerSettings
+import com.saveourtool.save.orchestrator.copyRecursivelyWithAttributes
+import com.saveourtool.save.orchestrator.execTimed
+import com.saveourtool.save.orchestrator.getHostIp
 
 import com.github.dockerjava.api.DockerClient
 import com.github.dockerjava.api.command.BuildImageResultCallback
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/AgentService.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/AgentService.kt
similarity index 93%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/AgentService.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/AgentService.kt
index cb0293036f..e24cef2e42 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/AgentService.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/AgentService.kt
@@ -1,22 +1,22 @@
-package org.cqfn.save.orchestrator.service
+package com.saveourtool.save.orchestrator.service
 
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.HeartbeatResponse
-import org.cqfn.save.agent.NewJobResponse
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.agent.WaitResponse
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.Agent
-import org.cqfn.save.entities.AgentStatus
-import org.cqfn.save.entities.AgentStatusDto
-import org.cqfn.save.entities.AgentStatusesForExecution
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionUpdateDto
-import org.cqfn.save.orchestrator.BodilessResponseEntity
-import org.cqfn.save.test.TestBatch
-import org.cqfn.save.test.TestDto
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.HeartbeatResponse
+import com.saveourtool.save.agent.NewJobResponse
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.agent.WaitResponse
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.Agent
+import com.saveourtool.save.entities.AgentStatus
+import com.saveourtool.save.entities.AgentStatusDto
+import com.saveourtool.save.entities.AgentStatusesForExecution
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionUpdateDto
+import com.saveourtool.save.orchestrator.BodilessResponseEntity
+import com.saveourtool.save.test.TestBatch
+import com.saveourtool.save.test.TestDto
+import com.saveourtool.save.testsuite.TestSuiteType
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Qualifier
@@ -223,7 +223,7 @@ class AgentService {
                 executionId to if (agentStatuses.areIdleOrFinished()) {
                     // We assume, that all agents will eventually have one of these statuses.
                     // Situations when agent gets stuck with a different status and for whatever reason is unable to update
-                    // it, are not handled. Anyway, such agents should be eventually stopped: https://github.com/analysis-dev/save-cloud/issues/208
+                    // it, are not handled. Anyway, such agents should be eventually stopped: https://github.com/saveourtool/save-cloud/issues/208
                     agentStatuses.map { it.containerId }
                 } else {
                     emptyList()
diff --git a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/DockerService.kt b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/DockerService.kt
similarity index 93%
rename from save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/DockerService.kt
rename to save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/DockerService.kt
index 6a5e968623..e3368967ac 100644
--- a/save-orchestrator/src/main/kotlin/org/cqfn/save/orchestrator/service/DockerService.kt
+++ b/save-orchestrator/src/main/kotlin/com/saveourtool/save/orchestrator/service/DockerService.kt
@@ -1,20 +1,20 @@
-package org.cqfn.save.orchestrator.service
-
-import org.cqfn.save.domain.Python
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionUpdateDto
-import org.cqfn.save.orchestrator.SAVE_CLI_EXECUTABLE_NAME
-import org.cqfn.save.orchestrator.config.ConfigProperties
-import org.cqfn.save.orchestrator.copyRecursivelyWithAttributes
-import org.cqfn.save.orchestrator.createSyntheticTomlConfig
-import org.cqfn.save.orchestrator.docker.ContainerManager
-import org.cqfn.save.orchestrator.fillAgentPropertiesFromConfiguration
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.utils.PREFIX_FOR_SUITES_LOCATION_IN_STANDARD_MODE
-import org.cqfn.save.utils.STANDARD_TEST_SUITE_DIR
-import org.cqfn.save.utils.moveFileWithAttributes
+package com.saveourtool.save.orchestrator.service
+
+import com.saveourtool.save.domain.Python
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionUpdateDto
+import com.saveourtool.save.orchestrator.SAVE_CLI_EXECUTABLE_NAME
+import com.saveourtool.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.copyRecursivelyWithAttributes
+import com.saveourtool.save.orchestrator.createSyntheticTomlConfig
+import com.saveourtool.save.orchestrator.docker.ContainerManager
+import com.saveourtool.save.orchestrator.fillAgentPropertiesFromConfiguration
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.utils.PREFIX_FOR_SUITES_LOCATION_IN_STANDARD_MODE
+import com.saveourtool.save.utils.STANDARD_TEST_SUITE_DIR
+import com.saveourtool.save.utils.moveFileWithAttributes
 
 import com.github.dockerjava.api.exception.DockerException
 import io.micrometer.core.instrument.MeterRegistry
@@ -249,7 +249,7 @@ class DockerService(private val configProperties: ConfigProperties,
 
         val baseImage = execution.sdk
         val aptCmd = "apt-get ${configProperties.aptExtraFlags}"
-        // fixme: https://github.com/analysis-dev/save-cloud/issues/352
+        // fixme: https://github.com/saveourtool/save-cloud/issues/352
         val additionalRunCmd = if (execution.sdk.startsWith(Python.NAME, ignoreCase = true)) {
             """|RUN env DEBIAN_FRONTEND="noninteractive" $aptCmd install zip
                |RUN curl -s "https://get.sdkman.io" | bash
@@ -351,7 +351,7 @@ class DockerService(private val configProperties: ConfigProperties,
     @Suppress("UnsafeCallOnNullableType", "TOO_MANY_LINES_IN_LAMBDA")
     private fun copyTestSuitesToResourcesPath(testSuitesForDocker: List<TestSuiteDto>, destination: File) {
         FileSystemUtils.deleteRecursively(destination)
-        // TODO: https://github.com/analysis-dev/save-cloud/issues/321
+        // TODO: https://github.com/saveourtool/save-cloud/issues/321
         log.info("Copying suites ${testSuitesForDocker.map { it.name }} into $destination")
         testSuitesForDocker.forEach {
             val standardTestSuiteAbsolutePath = File(configProperties.testResources.basePath)
diff --git a/save-orchestrator/src/main/resources/logback.xml b/save-orchestrator/src/main/resources/logback.xml
index 47825a3160..c17bca5a09 100644
--- a/save-orchestrator/src/main/resources/logback.xml
+++ b/save-orchestrator/src/main/resources/logback.xml
@@ -5,8 +5,8 @@
         </encoder>
     </appender>
 
-    <logger name="org.cqfn.save.orchestrator.controller.HeartbeatController" level="DEBUG"/>
-    <logger name="org.cqfn.save.orchestrator.service.AgentService" level="DEBUG"/>
+    <logger name="com.saveourtool.save.orchestrator.controller.HeartbeatController" level="DEBUG"/>
+    <logger name="com.saveourtool.save.orchestrator.service.AgentService" level="DEBUG"/>
     <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/UtilsTest.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/UtilsTest.kt
similarity index 98%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/UtilsTest.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/UtilsTest.kt
index 3352c4d55d..82919f9cc0 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/UtilsTest.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/UtilsTest.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.orchestrator
+package com.saveourtool.save.orchestrator
 
 import org.junit.Test
 import org.junit.jupiter.api.Assertions.assertEquals
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/agents/AgentsControllerTest.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/agents/AgentsControllerTest.kt
similarity index 90%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/agents/AgentsControllerTest.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/agents/AgentsControllerTest.kt
index e120151295..881aab095a 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/agents/AgentsControllerTest.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/agents/AgentsControllerTest.kt
@@ -1,18 +1,18 @@
-package org.cqfn.save.orchestrator.controller.agents
-
-import org.cqfn.save.agent.ExecutionLogs
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Project
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.orchestrator.config.Beans
-import org.cqfn.save.orchestrator.config.ConfigProperties
-import org.cqfn.save.orchestrator.controller.AgentsController
-import org.cqfn.save.orchestrator.service.AgentService
-import org.cqfn.save.orchestrator.service.DockerService
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.testutils.enqueue
+package com.saveourtool.save.orchestrator.controller.agents
+
+import com.saveourtool.save.agent.ExecutionLogs
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.orchestrator.config.Beans
+import com.saveourtool.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.controller.AgentsController
+import com.saveourtool.save.orchestrator.service.AgentService
+import com.saveourtool.save.orchestrator.service.DockerService
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.testutils.enqueue
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt
similarity index 94%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt
index c891bc2c6f..f7dcafddef 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/controller/heartbeat/HeartbeatControllerTest.kt
@@ -1,24 +1,24 @@
-package org.cqfn.save.orchestrator.controller.heartbeat
-
-import org.cqfn.save.agent.AgentState
-import org.cqfn.save.agent.ExecutionProgress
-import org.cqfn.save.agent.Heartbeat
-import org.cqfn.save.agent.NewJobResponse
-import org.cqfn.save.agent.TestExecutionDto
-import org.cqfn.save.domain.TestResultStatus
-import org.cqfn.save.entities.AgentStatusDto
-import org.cqfn.save.entities.AgentStatusesForExecution
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.orchestrator.config.Beans
-import org.cqfn.save.orchestrator.config.LocalDateTimeConfig
-import org.cqfn.save.orchestrator.controller.HeartBeatInspector
-import org.cqfn.save.orchestrator.controller.crashedAgentsList
-import org.cqfn.save.orchestrator.service.AgentService
-import org.cqfn.save.orchestrator.service.DockerService
-import org.cqfn.save.test.TestBatch
-import org.cqfn.save.test.TestDto
-import org.cqfn.save.testsuite.TestSuiteType
-import org.cqfn.save.testutils.*
+package com.saveourtool.save.orchestrator.controller.heartbeat
+
+import com.saveourtool.save.agent.AgentState
+import com.saveourtool.save.agent.ExecutionProgress
+import com.saveourtool.save.agent.Heartbeat
+import com.saveourtool.save.agent.NewJobResponse
+import com.saveourtool.save.agent.TestExecutionDto
+import com.saveourtool.save.domain.TestResultStatus
+import com.saveourtool.save.entities.AgentStatusDto
+import com.saveourtool.save.entities.AgentStatusesForExecution
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.orchestrator.config.Beans
+import com.saveourtool.save.orchestrator.config.LocalDateTimeConfig
+import com.saveourtool.save.orchestrator.controller.HeartBeatInspector
+import com.saveourtool.save.orchestrator.controller.crashedAgentsList
+import com.saveourtool.save.orchestrator.service.AgentService
+import com.saveourtool.save.orchestrator.service.DockerService
+import com.saveourtool.save.test.TestBatch
+import com.saveourtool.save.test.TestDto
+import com.saveourtool.save.testsuite.TestSuiteType
+import com.saveourtool.save.testutils.*
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import okhttp3.mockwebserver.MockResponse
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/docker/ContainerManagerTest.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManagerTest.kt
similarity index 97%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/docker/ContainerManagerTest.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManagerTest.kt
index cc13874a52..282e1e0507 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/docker/ContainerManagerTest.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/docker/ContainerManagerTest.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.orchestrator.docker
+package com.saveourtool.save.orchestrator.docker
 
-import org.cqfn.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.config.ConfigProperties
 
 import com.github.dockerjava.api.command.PullImageResultCallback
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/service/DockerServiceTest.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/service/DockerServiceTest.kt
similarity index 89%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/service/DockerServiceTest.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/service/DockerServiceTest.kt
index a642ea3e40..7aec823b0b 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/service/DockerServiceTest.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/service/DockerServiceTest.kt
@@ -1,15 +1,15 @@
-package org.cqfn.save.orchestrator.service
+package com.saveourtool.save.orchestrator.service
 
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.Project
-import org.cqfn.save.orchestrator.config.Beans
-import org.cqfn.save.orchestrator.config.ConfigProperties
-import org.cqfn.save.orchestrator.controller.AgentsController
-import org.cqfn.save.orchestrator.testutils.TestConfiguration
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
-import org.cqfn.save.testutils.enqueue
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.orchestrator.config.Beans
+import com.saveourtool.save.orchestrator.config.ConfigProperties
+import com.saveourtool.save.orchestrator.controller.AgentsController
+import com.saveourtool.save.orchestrator.testutils.TestConfiguration
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
+import com.saveourtool.save.testutils.enqueue
 
 import com.github.dockerjava.api.async.ResultCallback
 import com.github.dockerjava.api.model.Frame
diff --git a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/testutils/TestConfiguration.kt b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/testutils/TestConfiguration.kt
similarity index 89%
rename from save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/testutils/TestConfiguration.kt
rename to save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/testutils/TestConfiguration.kt
index 15ae999fe4..f0c8472915 100644
--- a/save-orchestrator/src/test/kotlin/org/cqfn/save/orchestrator/testutils/TestConfiguration.kt
+++ b/save-orchestrator/src/test/kotlin/com/saveourtool/save/orchestrator/testutils/TestConfiguration.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.orchestrator.testutils
+package com.saveourtool.save.orchestrator.testutils
 
 import io.micrometer.core.instrument.MeterRegistry
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry
diff --git a/save-orchestrator/src/test/resources/application.properties b/save-orchestrator/src/test/resources/application.properties
index 9de9bad791..1d0cafe474 100644
--- a/save-orchestrator/src/test/resources/application.properties
+++ b/save-orchestrator/src/test/resources/application.properties
@@ -14,4 +14,4 @@ orchestrator.adjustResourceOwner=false
 orchestrator.agentsHeartBeatTimeoutMillis=5000
 orchestrator.heartBeatInspectorInterval=3
 logging.level.com.github.dockerjava.core.command=DEBUG
-logging.level.org.cqfn.save.testutils.LoggingQueueDispatcher=INFO
+logging.level.com.saveourtool.save.testutils.LoggingQueueDispatcher=INFO
diff --git a/save-preprocessor/build.gradle.kts b/save-preprocessor/build.gradle.kts
index e5d7ce0571..0e2fef3c17 100644
--- a/save-preprocessor/build.gradle.kts
+++ b/save-preprocessor/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.cqfn.save.buildutils.configureJacoco
-import org.cqfn.save.buildutils.configureSpringBoot
+import com.saveourtool.save.buildutils.configureJacoco
+import com.saveourtool.save.buildutils.configureSpringBoot
 
 plugins {
     kotlin("jvm")
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/SavePreprocessor.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/SavePreprocessor.kt
similarity index 87%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/SavePreprocessor.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/SavePreprocessor.kt
index b177c26164..a387c8c7d8 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/SavePreprocessor.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/SavePreprocessor.kt
@@ -1,6 +1,6 @@
-package org.cqfn.save.preprocessor
+package com.saveourtool.save.preprocessor
 
-import org.cqfn.save.preprocessor.config.ConfigProperties
+import com.saveourtool.save.preprocessor.config.ConfigProperties
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.context.properties.EnableConfigurationProperties
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/ConfigProperties.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/ConfigProperties.kt
similarity index 93%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/ConfigProperties.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/ConfigProperties.kt
index 05f839de23..3907d399a4 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/ConfigProperties.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/ConfigProperties.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.preprocessor.config
+package com.saveourtool.save.preprocessor.config
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.ConstructorBinding
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/LocalDateTimeConfig.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/LocalDateTimeConfig.kt
similarity index 96%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/LocalDateTimeConfig.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/LocalDateTimeConfig.kt
index cf417d57d9..5c1855c3e6 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/LocalDateTimeConfig.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/LocalDateTimeConfig.kt
@@ -9,9 +9,9 @@
     "MISSING_KDOC_ON_FUNCTION",
 )
 
-package org.cqfn.save.preprocessor.config
+package com.saveourtool.save.preprocessor.config
 
-import org.cqfn.save.utils.LocalDateTimeSerializer
+import com.saveourtool.save.utils.LocalDateTimeSerializer
 
 import com.fasterxml.jackson.databind.SerializationFeature
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/TestSuitesRepo.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/TestSuitesRepo.kt
similarity index 87%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/TestSuitesRepo.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/TestSuitesRepo.kt
index dd57a3fe74..fc2845a7ff 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/config/TestSuitesRepo.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/config/TestSuitesRepo.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.preprocessor.config
+package com.saveourtool.save.preprocessor.config
 
 /**
  * Class for repositories with standard test suites
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt
similarity index 90%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt
index f10085d5d5..07dd38ea27 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/AwesomeBenchmarksDownloadController.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.preprocessor.controllers
+package com.saveourtool.save.preprocessor.controllers
 
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.benchmarks.BenchmarkEntity
-import org.cqfn.save.preprocessor.config.ConfigProperties
-import org.cqfn.save.preprocessor.utils.generateDirectory
-import org.cqfn.save.preprocessor.utils.pullOrCloneProjectWithSpecificBranch
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.benchmarks.BenchmarkEntity
+import com.saveourtool.save.preprocessor.config.ConfigProperties
+import com.saveourtool.save.preprocessor.utils.generateDirectory
+import com.saveourtool.save.preprocessor.utils.pullOrCloneProjectWithSpecificBranch
 
 import com.akuleshov7.ktoml.file.TomlFileReader
 import org.eclipse.jgit.api.errors.GitAPIException
@@ -91,7 +91,7 @@ class AwesomeBenchmarksDownloadController(
     }
 
     companion object {
-        private const val AWESOME_BENCHMARKS_URL = "https://github.com/analysis-dev/awesome-benchmarks.git"
+        private const val AWESOME_BENCHMARKS_URL = "https://github.com/saveourtool/awesome-benchmarks.git"
 
         @JvmStatic
         internal val log = LoggerFactory.getLogger(AwesomeBenchmarksDownloadController::class.java)
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityController.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityController.kt
similarity index 96%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityController.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityController.kt
index 006f9aeb46..1d3e0817c7 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityController.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityController.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.preprocessor.controllers
+package com.saveourtool.save.preprocessor.controllers
 
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.errors.TransportException
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectController.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectController.kt
similarity index 95%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectController.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectController.kt
index 09aae0d9f2..cdd0e454fa 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectController.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectController.kt
@@ -1,30 +1,30 @@
-package org.cqfn.save.preprocessor.controllers
-
-import org.cqfn.save.core.config.SaveProperties
-import org.cqfn.save.core.config.TestConfig
-import org.cqfn.save.core.config.defaultConfig
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.entities.Execution
-import org.cqfn.save.entities.ExecutionRequest
-import org.cqfn.save.entities.ExecutionRequestForStandardSuites
-import org.cqfn.save.entities.GitDto
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.execution.ExecutionInitializationDto
-import org.cqfn.save.execution.ExecutionStatus
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.execution.ExecutionUpdateDto
-import org.cqfn.save.preprocessor.EmptyResponse
-import org.cqfn.save.preprocessor.StatusResponse
-import org.cqfn.save.preprocessor.TextResponse
-import org.cqfn.save.preprocessor.config.ConfigProperties
-import org.cqfn.save.preprocessor.config.TestSuitesRepo
-import org.cqfn.save.preprocessor.service.TestDiscoveringService
-import org.cqfn.save.preprocessor.utils.*
-import org.cqfn.save.preprocessor.utils.generateDirectory
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
-import org.cqfn.save.utils.moveFileWithAttributes
+package com.saveourtool.save.preprocessor.controllers
+
+import com.saveourtool.save.core.config.SaveProperties
+import com.saveourtool.save.core.config.TestConfig
+import com.saveourtool.save.core.config.defaultConfig
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.entities.Execution
+import com.saveourtool.save.entities.ExecutionRequest
+import com.saveourtool.save.entities.ExecutionRequestForStandardSuites
+import com.saveourtool.save.entities.GitDto
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.execution.ExecutionInitializationDto
+import com.saveourtool.save.execution.ExecutionStatus
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.execution.ExecutionUpdateDto
+import com.saveourtool.save.preprocessor.EmptyResponse
+import com.saveourtool.save.preprocessor.StatusResponse
+import com.saveourtool.save.preprocessor.TextResponse
+import com.saveourtool.save.preprocessor.config.ConfigProperties
+import com.saveourtool.save.preprocessor.config.TestSuitesRepo
+import com.saveourtool.save.preprocessor.service.TestDiscoveringService
+import com.saveourtool.save.preprocessor.utils.*
+import com.saveourtool.save.preprocessor.utils.generateDirectory
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
+import com.saveourtool.save.utils.moveFileWithAttributes
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import okio.FileSystem
@@ -204,7 +204,7 @@ class DownloadProjectController(
                             StandardCopyOption.COPY_ATTRIBUTES
                         )
                         // FixMe: currently it's quite rough solution, to make all additional files executable
-                        // FixMe: https://github.com/analysis-dev/save-cloud/issues/442
+                        // FixMe: https://github.com/saveourtool/save-cloud/issues/442
                         if (!resourcesLocation.resolve(file.name).setExecutable(true)) {
                             log.warn("Failed to mark file ${resourcesLocation.resolve(file.name)} as executable")
                         }
@@ -339,7 +339,7 @@ class DownloadProjectController(
             moveFileWithAttributes(it, tmpDir)
         }
         val project = executionRequestForStandardSuites.project
-        // TODO: Save the proper version https://github.com/analysis-dev/save-cloud/issues/321
+        // TODO: Save the proper version https://github.com/saveourtool/save-cloud/issues/321
         val version = files.first().name
         val execCmd = executionRequestForStandardSuites.execCmd
         val batchSizeForAnalyzer = executionRequestForStandardSuites.batchSizeForAnalyzer
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringService.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringService.kt
similarity index 87%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringService.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringService.kt
index 02b8042858..e00946f0e9 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringService.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringService.kt
@@ -1,16 +1,16 @@
-package org.cqfn.save.preprocessor.service
+package com.saveourtool.save.preprocessor.service
 
-import org.cqfn.save.core.config.TestConfig
-import org.cqfn.save.core.files.ConfigDetector
-import org.cqfn.save.core.plugin.GeneralConfig
-import org.cqfn.save.core.utils.buildActivePlugins
-import org.cqfn.save.core.utils.processInPlace
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.preprocessor.utils.toHash
-import org.cqfn.save.test.TestDto
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.core.config.TestConfig
+import com.saveourtool.save.core.files.ConfigDetector
+import com.saveourtool.save.core.plugin.GeneralConfig
+import com.saveourtool.save.core.utils.buildActivePlugins
+import com.saveourtool.save.core.utils.processInPlace
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.preprocessor.utils.toHash
+import com.saveourtool.save.test.TestDto
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
 
 import okio.FileSystem
 import okio.Path.Companion.toPath
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/FileUtil.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/FileUtil.kt
similarity index 98%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/FileUtil.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/FileUtil.kt
index 76c13498d3..645c22381a 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/FileUtil.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/FileUtil.kt
@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package org.cqfn.save.preprocessor.utils
+package com.saveourtool.save.preprocessor.utils
 
 import org.slf4j.LoggerFactory
 import org.springframework.util.FileSystemUtils
diff --git a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/GitUtil.kt b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/GitUtil.kt
similarity index 98%
rename from save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/GitUtil.kt
rename to save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/GitUtil.kt
index 63f2daa04b..fed07fa352 100644
--- a/save-preprocessor/src/main/kotlin/org/cqfn/save/preprocessor/utils/GitUtil.kt
+++ b/save-preprocessor/src/main/kotlin/com/saveourtool/save/preprocessor/utils/GitUtil.kt
@@ -2,9 +2,9 @@
  * Git utilities that are used in preprocessor for download/clone/update git repo
  */
 
-package org.cqfn.save.preprocessor.utils
+package com.saveourtool.save.preprocessor.utils
 
-import org.cqfn.save.entities.GitDto
+import com.saveourtool.save.entities.GitDto
 import org.eclipse.jgit.api.CreateBranchCommand
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.api.MergeCommand
diff --git a/save-preprocessor/src/main/resources/TestSuitesRepos b/save-preprocessor/src/main/resources/TestSuitesRepos
index cb83c23419..8a18e5231f 100644
--- a/save-preprocessor/src/main/resources/TestSuitesRepos
+++ b/save-preprocessor/src/main/resources/TestSuitesRepos
@@ -1 +1 @@
-https://github.com/analysis-dev/save origin/main examples/kotlin-diktat;examples/discovery-test
\ No newline at end of file
+https://github.com/saveourtool/save-cli origin/main examples/kotlin-diktat;examples/discovery-test
diff --git a/save-preprocessor/src/main/resources/application.properties b/save-preprocessor/src/main/resources/application.properties
index 2e5535ede7..5aebe3651d 100644
--- a/save-preprocessor/src/main/resources/application.properties
+++ b/save-preprocessor/src/main/resources/application.properties
@@ -5,4 +5,4 @@ save.reposFileName=TestSuitesRepos
 save.reposTokenFileName=TestSuitesToken
 save.backend=http://backend:5800/internal
 save.orchestrator=http://orchestrator:5100
-logging.level.org.cqfn.save.preprocessor.service.TestDiscoveringService=DEBUG
+logging.level.com.saveourtool.save.preprocessor.service.TestDiscoveringService=DEBUG
diff --git a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityTest.kt b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityTest.kt
similarity index 87%
rename from save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityTest.kt
rename to save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityTest.kt
index 7b8a0f38e0..d27955c488 100644
--- a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/CheckGitConnectivityTest.kt
+++ b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/CheckGitConnectivityTest.kt
@@ -1,12 +1,12 @@
 @file:Suppress("SAY_NO_TO_VAR")
 
-package org.cqfn.save.preprocessor.controllers
+package com.saveourtool.save.preprocessor.controllers
 
-import org.cqfn.save.preprocessor.service.TestDiscoveringService
-import org.cqfn.save.preprocessor.utils.RepositoryVolume
-import org.cqfn.save.testutils.checkQueues
-import org.cqfn.save.testutils.cleanup
-import org.cqfn.save.testutils.createMockWebServer
+import com.saveourtool.save.preprocessor.service.TestDiscoveringService
+import com.saveourtool.save.preprocessor.utils.RepositoryVolume
+import com.saveourtool.save.testutils.checkQueues
+import com.saveourtool.save.testutils.cleanup
+import com.saveourtool.save.testutils.createMockWebServer
 
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.jupiter.api.*
@@ -43,12 +43,12 @@ class CheckGitConnectivityTest(
     fun testController() {
         var user = "test"
         var token = "test-token"
-        var url = "https://github.com/analysis-dev/save-cloud"
+        var url = "https://github.com/saveourtool/save-cloud"
         validate(user, token, url, true)
 
         user = "akuleshov7"
         token = "test-token"
-        url = "https://github.com/analysis-dev/save-cloud111"
+        url = "https://github.com/saveourtool/save-cloud111"
         validate(user, token, url, false)
     }
 
diff --git a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectTest.kt b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectTest.kt
similarity index 94%
rename from save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectTest.kt
rename to save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectTest.kt
index ef03c894ab..3f7e4a2049 100644
--- a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/controllers/DownloadProjectTest.kt
+++ b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/controllers/DownloadProjectTest.kt
@@ -1,19 +1,19 @@
-package org.cqfn.save.preprocessor.controllers
-
-import org.cqfn.save.core.config.TestConfig
-import org.cqfn.save.domain.FileInfo
-import org.cqfn.save.domain.Sdk
-import org.cqfn.save.entities.*
-import org.cqfn.save.execution.ExecutionType
-import org.cqfn.save.preprocessor.config.ConfigProperties
-import org.cqfn.save.preprocessor.config.LocalDateTimeConfig
-import org.cqfn.save.preprocessor.service.TestDiscoveringService
-import org.cqfn.save.preprocessor.utils.RepositoryVolume
-import org.cqfn.save.preprocessor.utils.toHash
-import org.cqfn.save.test.TestDto
-import org.cqfn.save.testsuite.TestSuiteDto
-import org.cqfn.save.testsuite.TestSuiteType
-import org.cqfn.save.testutils.*
+package com.saveourtool.save.preprocessor.controllers
+
+import com.saveourtool.save.core.config.TestConfig
+import com.saveourtool.save.domain.FileInfo
+import com.saveourtool.save.domain.Sdk
+import com.saveourtool.save.entities.*
+import com.saveourtool.save.execution.ExecutionType
+import com.saveourtool.save.preprocessor.config.ConfigProperties
+import com.saveourtool.save.preprocessor.config.LocalDateTimeConfig
+import com.saveourtool.save.preprocessor.service.TestDiscoveringService
+import com.saveourtool.save.preprocessor.utils.RepositoryVolume
+import com.saveourtool.save.preprocessor.utils.toHash
+import com.saveourtool.save.test.TestDto
+import com.saveourtool.save.testsuite.TestSuiteDto
+import com.saveourtool.save.testsuite.TestSuiteType
+import com.saveourtool.save.testutils.*
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import okhttp3.mockwebserver.MockResponse
@@ -121,13 +121,13 @@ class DownloadProjectTest(
     @Test
     fun testCorrectDownload() {
         val project = Project.stub(42).apply {
-            url = "https://github.com/analysis-dev/save.git"
+            url = "https://github.com/saveourtool/save-cli.git"
         }
         val executionId = 99L
         val execution = Execution.stub(project).apply {
             id = executionId
         }
-        val validRepo = GitDto("https://github.com/analysis-dev/save.git")
+        val validRepo = GitDto("https://github.com/saveourtool/save-cli.git")
         val request = ExecutionRequest(project, validRepo, "examples/kotlin-diktat/", Sdk.Default, execution.id)
         // /createExecution
         mockServerBackend.enqueue(
@@ -145,7 +145,7 @@ class DownloadProjectTest(
                 .setHeader("Content-Type", "application/json")
                 .setBody(objectMapper.writeValueAsString(
                     listOf(
-                        TestSuite(TestSuiteType.PROJECT, "", null, project, LocalDateTime.now(), "save.properties", "https://github.com/analysis-dev/save.git").apply {
+                        TestSuite(TestSuiteType.PROJECT, "", null, project, LocalDateTime.now(), "save.properties", "https://github.com/saveourtool/save-cli.git").apply {
                             id = 42L
                         }
                     )
@@ -307,7 +307,7 @@ class DownloadProjectTest(
         repeat(requestSize) {
             val project = Project.stub(42)
 
-            val tempDir = "${configProperties.repository}/${"https://github.com/analysis-dev/save".hashCode()}/examples/kotlin-diktat/"
+            val tempDir = "${configProperties.repository}/${"https://github.com/saveourtool/save-cli".hashCode()}/examples/kotlin-diktat/"
             val config = "${tempDir}save.toml"
             File(tempDir).mkdirs()
             File(config).createNewFile()
@@ -376,7 +376,7 @@ class DownloadProjectTest(
             .isAccepted
         Thread.sleep(15_000)
         assertions.orTimeout(60, TimeUnit.SECONDS).join().forEach { Assertions.assertNotNull(it) }
-        Assertions.assertTrue(File("${configProperties.repository}/${"https://github.com/analysis-dev/save".hashCode()}").exists())
+        Assertions.assertTrue(File("${configProperties.repository}/${"https://github.com/saveourtool/save-cli".hashCode()}").exists())
     }
 
     @Test
@@ -386,7 +386,7 @@ class DownloadProjectTest(
         val execution = Execution.stub(project).apply {
             id = 98L
         }
-        val request = ExecutionRequest(project, GitDto("https://github.com/analysis-dev/save"), "examples/kotlin-diktat/", Sdk.Default, execution.id)
+        val request = ExecutionRequest(project, GitDto("https://github.com/saveourtool/save-cli"), "examples/kotlin-diktat/", Sdk.Default, execution.id)
 
         // /updateExecutionByDto
         mockServerBackend.enqueue(
@@ -476,7 +476,7 @@ class DownloadProjectTest(
             type = ExecutionType.STANDARD
             id = 98L
         }
-        val request = ExecutionRequest(project, GitDto("https://github.com/analysis-dev/save"), "examples/kotlin-diktat/", Sdk.Default, execution.id)
+        val request = ExecutionRequest(project, GitDto("https://github.com/saveourtool/save-cli"), "examples/kotlin-diktat/", Sdk.Default, execution.id)
 
         val testSuite = TestSuite(TestSuiteType.STANDARD, "", null, project, LocalDateTime.now(), ".").apply {
             id = 42
diff --git a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringServiceTest.kt b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringServiceTest.kt
similarity index 91%
rename from save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringServiceTest.kt
rename to save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringServiceTest.kt
index 066aee54c6..098f94e6e3 100644
--- a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/service/TestDiscoveringServiceTest.kt
+++ b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/service/TestDiscoveringServiceTest.kt
@@ -1,10 +1,10 @@
-package org.cqfn.save.preprocessor.service
+package com.saveourtool.save.preprocessor.service
 
-import org.cqfn.save.core.config.TestConfig
-import org.cqfn.save.entities.Project
-import org.cqfn.save.entities.TestSuite
-import org.cqfn.save.preprocessor.config.ConfigProperties
-import org.cqfn.save.testsuite.TestSuiteType
+import com.saveourtool.save.core.config.TestConfig
+import com.saveourtool.save.entities.Project
+import com.saveourtool.save.entities.TestSuite
+import com.saveourtool.save.preprocessor.config.ConfigProperties
+import com.saveourtool.save.testsuite.TestSuiteType
 import org.eclipse.jgit.api.Git
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
@@ -37,7 +37,7 @@ class TestDiscoveringServiceTest {
     fun setUp() {
         tmpDir = createTempDirectory(this::class.simpleName)
         Git.cloneRepository()
-            .setURI("https://github.com/analysis-dev/save")
+            .setURI("https://github.com/saveourtool/save-cli")
             .setDirectory(tmpDir.toFile())
             .call().use {
                 it.checkout().setName("993aa6228cba0a9f9075fb3aca8a0a8b9196a12a").call()
diff --git a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/utils/RepositoryVolume.kt b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/utils/RepositoryVolume.kt
similarity index 93%
rename from save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/utils/RepositoryVolume.kt
rename to save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/utils/RepositoryVolume.kt
index 1ddfb3b74a..40a5ccdd17 100644
--- a/save-preprocessor/src/test/kotlin/org/cqfn/save/preprocessor/utils/RepositoryVolume.kt
+++ b/save-preprocessor/src/test/kotlin/com/saveourtool/save/preprocessor/utils/RepositoryVolume.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.preprocessor.utils
+package com.saveourtool.save.preprocessor.utils
 
 import org.springframework.test.context.DynamicPropertyRegistry
 import org.springframework.test.context.DynamicPropertySource
diff --git a/save-preprocessor/src/test/resources/application.properties b/save-preprocessor/src/test/resources/application.properties
index 30445aee67..fc32b0cb1f 100644
--- a/save-preprocessor/src/test/resources/application.properties
+++ b/save-preprocessor/src/test/resources/application.properties
@@ -6,4 +6,4 @@ save.reposTokenFileName=TestSuitesToken
 save.backend=http://localhost:8000/internal
 save.orchestrator=http://localhost:8001
 #logging
-logging.level.org.cqfn.save.testutils.LoggingQueueDispatcher=INFO
+logging.level.com.saveourtool.save.testutils.LoggingQueueDispatcher=INFO
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e6c95ccffe..c1a97b3e91 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,13 +3,13 @@ rootProject.name = "save-cloud"
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
-        maven("https://oss.sonatype.org/content/repositories/snapshots") {
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots") {
             content {
-                includeGroup("org.cqfn.save")
+                includeGroup("com.saveourtool.save")
             }
         }
         maven {
-            url = uri("https://maven.pkg.github.com/analysis-dev/sarif4k")
+            url = uri("https://maven.pkg.github.com/saveourtool/sarif4k")
             val gprUser: String? by settings
             val gprKey: String? by settings
             credentials {
diff --git a/test-utils/src/main/kotlin/org/cqfn/save/testutils/MockWebServerUtils.kt b/test-utils/src/main/kotlin/com/saveourtool/save/testutils/MockWebServerUtils.kt
similarity index 99%
rename from test-utils/src/main/kotlin/org/cqfn/save/testutils/MockWebServerUtils.kt
rename to test-utils/src/main/kotlin/com/saveourtool/save/testutils/MockWebServerUtils.kt
index d347cf7ff8..1cd8cf4d6e 100644
--- a/test-utils/src/main/kotlin/org/cqfn/save/testutils/MockWebServerUtils.kt
+++ b/test-utils/src/main/kotlin/com/saveourtool/save/testutils/MockWebServerUtils.kt
@@ -1,6 +1,6 @@
 @file:Suppress("FILE_NAME_MATCH_CLASS", "MatchingDeclarationName")
 
-package org.cqfn.save.testutils
+package com.saveourtool.save.testutils
 
 import okhttp3.mockwebserver.*
 import org.junit.Assert.assertTrue
diff --git a/test-utils/src/test/kotlin/org/cqfn/save/testutils/LoggingQueueDispatcherTest.kt b/test-utils/src/test/kotlin/com/saveourtool/save/testutils/LoggingQueueDispatcherTest.kt
similarity index 98%
rename from test-utils/src/test/kotlin/org/cqfn/save/testutils/LoggingQueueDispatcherTest.kt
rename to test-utils/src/test/kotlin/com/saveourtool/save/testutils/LoggingQueueDispatcherTest.kt
index df149934a9..bc8329f2f4 100644
--- a/test-utils/src/test/kotlin/org/cqfn/save/testutils/LoggingQueueDispatcherTest.kt
+++ b/test-utils/src/test/kotlin/com/saveourtool/save/testutils/LoggingQueueDispatcherTest.kt
@@ -1,4 +1,4 @@
-package org.cqfn.save.testutils
+package com.saveourtool.save.testutils
 
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.RecordedRequest