diff --git a/efisty-cli/.gitignore b/efsity-cli/.gitignore
similarity index 100%
rename from efisty-cli/.gitignore
rename to efsity-cli/.gitignore
diff --git a/efisty-cli/README.md b/efsity-cli/README.md
similarity index 100%
rename from efisty-cli/README.md
rename to efsity-cli/README.md
diff --git a/efisty-cli/build.gradle.kts b/efsity-cli/build.gradle.kts
similarity index 100%
rename from efisty-cli/build.gradle.kts
rename to efsity-cli/build.gradle.kts
diff --git a/efisty-cli/docs/QuestionnaireResponseGenerator.md b/efsity-cli/docs/QuestionnaireResponseGenerator.md
similarity index 100%
rename from efisty-cli/docs/QuestionnaireResponseGenerator.md
rename to efsity-cli/docs/QuestionnaireResponseGenerator.md
diff --git a/efisty-cli/gradle.properties b/efsity-cli/gradle.properties
similarity index 100%
rename from efisty-cli/gradle.properties
rename to efsity-cli/gradle.properties
diff --git a/efisty-cli/gradle/wrapper/gradle-wrapper.jar b/efsity-cli/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from efisty-cli/gradle/wrapper/gradle-wrapper.jar
rename to efsity-cli/gradle/wrapper/gradle-wrapper.jar
diff --git a/efisty-cli/gradle/wrapper/gradle-wrapper.properties b/efsity-cli/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from efisty-cli/gradle/wrapper/gradle-wrapper.properties
rename to efsity-cli/gradle/wrapper/gradle-wrapper.properties
diff --git a/efisty-cli/gradlew b/efsity-cli/gradlew
similarity index 100%
rename from efisty-cli/gradlew
rename to efsity-cli/gradlew
diff --git a/efisty-cli/gradlew.bat b/efsity-cli/gradlew.bat
similarity index 100%
rename from efisty-cli/gradlew.bat
rename to efsity-cli/gradlew.bat
diff --git a/efisty-cli/libs.versions.toml b/efsity-cli/libs.versions.toml
similarity index 100%
rename from efisty-cli/libs.versions.toml
rename to efsity-cli/libs.versions.toml
diff --git a/efisty-cli/settings.gradle.kts b/efsity-cli/settings.gradle.kts
similarity index 100%
rename from efisty-cli/settings.gradle.kts
rename to efsity-cli/settings.gradle.kts
diff --git a/efisty-cli/src/main/java/org/smartregister/Main.java b/efsity-cli/src/main/java/org/smartregister/Main.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/Main.java
rename to efsity-cli/src/main/java/org/smartregister/Main.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java b/efsity-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/CarePlanGeneratorCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/ConvertCommand.java b/efsity-cli/src/main/java/org/smartregister/command/ConvertCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/ConvertCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/ConvertCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java b/efsity-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/PublishFhirResourcesCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java b/efsity-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/QuestionnaireResponseGeneratorCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java b/efsity-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/StructureMapExtractResourcesCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/TranslateCommand.java b/efsity-cli/src/main/java/org/smartregister/command/TranslateCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/TranslateCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/TranslateCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/ValidateCommand.java b/efsity-cli/src/main/java/org/smartregister/command/ValidateCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/ValidateCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/ValidateCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java b/efsity-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/ValidateFhirResourcesCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java b/efsity-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/ValidateFileStructureCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java b/efsity-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java
rename to efsity-cli/src/main/java/org/smartregister/command/ValidateStructureMapCommand.java
diff --git a/efisty-cli/src/main/java/org/smartregister/domain/FctFile.java b/efsity-cli/src/main/java/org/smartregister/domain/FctFile.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/domain/FctFile.java
rename to efsity-cli/src/main/java/org/smartregister/domain/FctFile.java
diff --git a/efisty-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java b/efsity-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java
rename to efsity-cli/src/main/java/org/smartregister/processor/FctValidationProcessor.java
diff --git a/efisty-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java b/efsity-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java
rename to efsity-cli/src/main/java/org/smartregister/processor/QuestionnaireProcessor.java
diff --git a/efisty-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java b/efsity-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java
rename to efsity-cli/src/main/java/org/smartregister/processor/StructureMapProcessor.java
diff --git a/efisty-cli/src/main/java/org/smartregister/util/FCTConstants.java b/efsity-cli/src/main/java/org/smartregister/util/FCTConstants.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/util/FCTConstants.java
rename to efsity-cli/src/main/java/org/smartregister/util/FCTConstants.java
diff --git a/efisty-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java b/efsity-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
rename to efsity-cli/src/main/java/org/smartregister/util/FctStructureMapUtilities.java
diff --git a/efisty-cli/src/main/java/org/smartregister/util/FctUtils.java b/efsity-cli/src/main/java/org/smartregister/util/FctUtils.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/util/FctUtils.java
rename to efsity-cli/src/main/java/org/smartregister/util/FctUtils.java
diff --git a/efisty-cli/src/main/java/org/smartregister/util/HttpClient.java b/efsity-cli/src/main/java/org/smartregister/util/HttpClient.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/util/HttpClient.java
rename to efsity-cli/src/main/java/org/smartregister/util/HttpClient.java
diff --git a/efisty-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java b/efsity-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java
similarity index 100%
rename from efisty-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java
rename to efsity-cli/src/main/java/org/smartregister/util/authentication/OAuthAuthentication.java
diff --git a/efisty-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt b/efsity-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt
similarity index 100%
rename from efisty-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt
rename to efsity-cli/src/main/kotlin/org/smartregister/external/CqlToLibraryConvertServices.kt
diff --git a/efisty-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt b/efsity-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt
similarity index 100%
rename from efisty-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt
rename to efsity-cli/src/main/kotlin/org/smartregister/external/FhirCarePlanGeneratorLite.kt
diff --git a/efisty-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt b/efsity-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt
similarity index 100%
rename from efisty-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt
rename to efsity-cli/src/main/kotlin/org/smartregister/external/FhirPathEngineHostServices.kt
diff --git a/efisty-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt b/efsity-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt
similarity index 100%
rename from efisty-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt
rename to efsity-cli/src/main/kotlin/org/smartregister/external/TransformSupportServices.kt
diff --git a/efisty-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/PublishFhirResourcesCommandTest.java
diff --git a/efisty-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/QuestionnaireResponseGeneratorCommandTest.java
diff --git a/efisty-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/TranslateCommandTest.java
diff --git a/efisty-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/ValidateFhirResourcesCommandTest.java
diff --git a/efisty-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/ValidateFileStructureCommandTest.java
diff --git a/efisty-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java b/efsity-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java
similarity index 100%
rename from efisty-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java
rename to efsity-cli/src/test/java/org/smartregister/command/ValidateStructureMapCommandTest.java
diff --git a/efisty-cli/src/test/resources/clean_configs_folder/profile_config.json b/efsity-cli/src/test/resources/clean_configs_folder/profile_config.json
similarity index 100%
rename from efisty-cli/src/test/resources/clean_configs_folder/profile_config.json
rename to efsity-cli/src/test/resources/clean_configs_folder/profile_config.json
diff --git a/efisty-cli/src/test/resources/dirty_configs_folder/profile_config.json b/efsity-cli/src/test/resources/dirty_configs_folder/profile_config.json
similarity index 100%
rename from efisty-cli/src/test/resources/dirty_configs_folder/profile_config.json
rename to efsity-cli/src/test/resources/dirty_configs_folder/profile_config.json
diff --git a/efisty-cli/src/test/resources/fhirConfigsJsonSchema.json b/efsity-cli/src/test/resources/fhirConfigsJsonSchema.json
similarity index 100%
rename from efisty-cli/src/test/resources/fhirConfigsJsonSchema.json
rename to efsity-cli/src/test/resources/fhirConfigsJsonSchema.json
diff --git a/efisty-cli/src/test/resources/merged_questionnaire.json b/efsity-cli/src/test/resources/merged_questionnaire.json
similarity index 100%
rename from efisty-cli/src/test/resources/merged_questionnaire.json
rename to efsity-cli/src/test/resources/merged_questionnaire.json
diff --git a/efisty-cli/src/test/resources/profile_config.json b/efsity-cli/src/test/resources/profile_config.json
similarity index 100%
rename from efisty-cli/src/test/resources/profile_config.json
rename to efsity-cli/src/test/resources/profile_config.json
diff --git a/efisty-cli/src/test/resources/raw_questionnaire.json b/efsity-cli/src/test/resources/raw_questionnaire.json
similarity index 100%
rename from efisty-cli/src/test/resources/raw_questionnaire.json
rename to efsity-cli/src/test/resources/raw_questionnaire.json
diff --git a/efisty-cli/src/test/resources/strings_default.properties b/efsity-cli/src/test/resources/strings_default.properties
similarity index 100%
rename from efisty-cli/src/test/resources/strings_default.properties
rename to efsity-cli/src/test/resources/strings_default.properties
diff --git a/efisty-cli/src/test/resources/strings_fr.properties b/efsity-cli/src/test/resources/strings_fr.properties
similarity index 100%
rename from efisty-cli/src/test/resources/strings_fr.properties
rename to efsity-cli/src/test/resources/strings_fr.properties