diff --git a/.gitignore b/.gitignore
index 9a1891de42bf7ddf4a97082fa5ca8b290fc75535..2060fbffb24f9ea81a9e736f30d04becde30e3bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,7 +97,6 @@ versions.json
 # React client
 jams-react-client/node_modules/
 jams-react-client/build/
-jams-react-client/public/locales/
 jams-react-client/package-lock.json
 jams-server/src/main/resources/webapp/
 
diff --git a/jams-react-client/.tx/config b/jams-react-client/.tx/config
index 685113d60ef712dbb0f816b130d382fc28f640ee..e229497069acc2dc7c3751c68ebb9168d23788ea 100644
--- a/jams-react-client/.tx/config
+++ b/jams-react-client/.tx/config
@@ -2,9 +2,9 @@
 host = https://www.transifex.com
 
 [jams-jami-account-management-server.translation-json]
-file_filter = src/locales/<lang>/translation.json
+file_filter = public/locales/<lang>/translation.json
 minimum_perc = 0
-source_file = src/locales/en/translation.json
+source_file = public/locales/en/translation.json
 source_lang = en
 type = KEYVALUEJSON
 
diff --git a/jams-react-client/i18next-scanner.config.js b/jams-react-client/i18next-scanner.config.js
index 30a3ab07f350cf584e050906e2783fab7f2c3f6a..7b25a16ce4d2359e8390c50eb85e3daa95a42bf5 100644
--- a/jams-react-client/i18next-scanner.config.js
+++ b/jams-react-client/i18next-scanner.config.js
@@ -29,9 +29,9 @@ module.exports = {
     defaultValue: "__STRING_NOT_TRANSLATED__",
 
     resource: {
-      loadPath: "src/locales/{{lng}}/{{ns}}.json",
+      loadPath: "public/locales/{{lng}}/{{ns}}.json",
 
-      savePath: "src/locales/{{lng}}/{{ns}}.json",
+      savePath: "public/locales/{{lng}}/{{ns}}.json",
 
       jsonIndent: 4,
 
diff --git a/jams-react-client/package.json b/jams-react-client/package.json
index a1e79e5847708f7b430104237764a14e4ead8542..6dc68de4f3416614588fa181e4532c2a8ecb1f8a 100644
--- a/jams-react-client/package.json
+++ b/jams-react-client/package.json
@@ -44,7 +44,7 @@
   },
   "scripts": {
     "start": "NODE_PATH=./src react-scripts start",
-    "build": "react-scripts build && ./node_modules/.bin/i18next-scanner && cp -R src/locales public/",
+    "build": "react-scripts build && ./node_modules/.bin/i18next-scanner",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
diff --git a/jams-react-client/src/locales/ar/translation.json b/jams-react-client/public/locales/ar/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ar/translation.json
rename to jams-react-client/public/locales/ar/translation.json
diff --git a/jams-react-client/src/locales/be/translation.json b/jams-react-client/public/locales/be/translation.json
similarity index 100%
rename from jams-react-client/src/locales/be/translation.json
rename to jams-react-client/public/locales/be/translation.json
diff --git a/jams-react-client/src/locales/bg/translation.json b/jams-react-client/public/locales/bg/translation.json
similarity index 100%
rename from jams-react-client/src/locales/bg/translation.json
rename to jams-react-client/public/locales/bg/translation.json
diff --git a/jams-react-client/src/locales/bn/translation.json b/jams-react-client/public/locales/bn/translation.json
similarity index 100%
rename from jams-react-client/src/locales/bn/translation.json
rename to jams-react-client/public/locales/bn/translation.json
diff --git a/jams-react-client/src/locales/ca/translation.json b/jams-react-client/public/locales/ca/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ca/translation.json
rename to jams-react-client/public/locales/ca/translation.json
diff --git a/jams-react-client/src/locales/cs_CZ/translation.json b/jams-react-client/public/locales/cs_CZ/translation.json
similarity index 100%
rename from jams-react-client/src/locales/cs_CZ/translation.json
rename to jams-react-client/public/locales/cs_CZ/translation.json
diff --git a/jams-react-client/src/locales/da/translation.json b/jams-react-client/public/locales/da/translation.json
similarity index 100%
rename from jams-react-client/src/locales/da/translation.json
rename to jams-react-client/public/locales/da/translation.json
diff --git a/jams-react-client/src/locales/de/translation.json b/jams-react-client/public/locales/de/translation.json
similarity index 100%
rename from jams-react-client/src/locales/de/translation.json
rename to jams-react-client/public/locales/de/translation.json
diff --git a/jams-react-client/src/locales/el/translation.json b/jams-react-client/public/locales/el/translation.json
similarity index 100%
rename from jams-react-client/src/locales/el/translation.json
rename to jams-react-client/public/locales/el/translation.json
diff --git a/jams-react-client/src/locales/en/translation.json b/jams-react-client/public/locales/en/translation.json
similarity index 100%
rename from jams-react-client/src/locales/en/translation.json
rename to jams-react-client/public/locales/en/translation.json
diff --git a/jams-react-client/src/locales/eo/translation.json b/jams-react-client/public/locales/eo/translation.json
similarity index 100%
rename from jams-react-client/src/locales/eo/translation.json
rename to jams-react-client/public/locales/eo/translation.json
diff --git a/jams-react-client/src/locales/es/translation.json b/jams-react-client/public/locales/es/translation.json
similarity index 70%
rename from jams-react-client/src/locales/es/translation.json
rename to jams-react-client/public/locales/es/translation.json
index 668b315d6cc4233062ec9a7a9e5836aad4f9b9eb..f96bafeb54250b132aa7b46c44a0e4b55cb62e9a 100644
--- a/jams-react-client/src/locales/es/translation.json
+++ b/jams-react-client/public/locales/es/translation.json
@@ -11,68 +11,68 @@
     "create_user": "Crear usuario",
     "login_failed": "Error de inicio de sesion. Revisa sus credenciales",
     "sign_in": "Registrarse",
-    "common_name_is_required": "Common name is required.",
-    "state_is_required": "State is required.",
-    "city_is_required": "City is required.",
-    "organization_is_required": "Organization is required.",
-    "organization_unit_is_required": "Organization unit is required.",
-    "country_is_required": "Country is required.",
-    "certificate_file_is_required": "Certificate file is required.",
-    "private_key_file_is_required": "Private key file is required.",
-    "create_self_signed_certificate_authority": "Create a self-signed Certificate Authority",
-    "import_existing_certificate_authority": "Import existing Certificate Authority",
-    "5_years": "5 years",
-    "10_years": "10 years",
-    "unknown_error_occured_while_installing_the_ca": "An unknown error occurred while installing the CA. Please try again.",
-    "ca_setup_header": "Select an option for setting-up the certificate authority that will be used to sign all Jami accounts generated on this JAMS instance.",
-    "common_name": "Common Name",
-    "state": "State",
-    "cistatety": "City",
-    "organization": "Organization",
-    "organization_unit": "Organization Unit",
-    "generate_self_signed_certificate_authority": "Generate Self-Signed Certificate Authority",
-    "select_option_setting_up_certificate_authority": "Select an option for setting-up the certificate authority that will be used to sign all Jami accounts generated on this JAMS instance.",
-    "import_certificate_authority": "Import Certificate Authority",
-    "must_be_60_characters_or_less": "Must be 60 characters or less",
-    "username_is_required": "Username is required.",
-    "must_be_50_characters_or_less": "Must be 50 characters or less",
-    "password_must_match": "Passwords must match",
-    "password_confirmation_required": "Password confirmation is required.",
-    "information_appears_incorrect_connection_directory_failed": "The information provided appears to be incorrect, the connection to the directory has failed. Please check the information and credentials provided and try again.",
-    "identity_management": "Identity Management",
-    "select_type_of_user_directory": "Select the type of user directory to be integrated with JAMS",
-    "set_identity_parameters": "Set identity parameters",
-    "create_administrator_user": "Create Administrator User",
-    "certificate_authority_setup": "Certificate Authority Setup",
-    "server_parameters": "Server Parameters",
-    "choose_a_country": "Choose a country",
-    "active_directory_server_informations": "Active Directory server information",
-    "port": "Port",
+    "common_name_is_required": "Nombre común es obligatorio.",
+    "state_is_required": "El estado es obligatorio.",
+    "city_is_required": "La ciudad es obligatoria.",
+    "organization_is_required": "La organización es obligatoria.",
+    "organization_unit_is_required": "La unidad de organización es obligatoria.",
+    "country_is_required": "El país es obligatorio.",
+    "certificate_file_is_required": "El certificado es obligatorio.",
+    "private_key_file_is_required": "La llave privada es obligatoria.",
+    "create_self_signed_certificate_authority": "Crear una autoridad certificadora autofirmada",
+    "import_existing_certificate_authority": "Importar una autoridad certificadora existente",
+    "5_years": "5 años",
+    "10_years": "10 años",
+    "unknown_error_occured_while_installing_the_ca": "Ocurrío un error desconocido al instalar la autoridad certificadora. Inténtarlo de nuevo.",
+    "ca_setup_header": "Seleccione una opción para configurar la autoridad certificadora que se utilizará para firmar todas las cuentas de Jami generadas en esta instancia de JAMS.",
+    "common_name": "Nombre común",
+    "state": "Estado",
+    "cistatety": "Ciudad",
+    "organization": "Organización",
+    "organization_unit": "Unidad de organización",
+    "generate_self_signed_certificate_authority": "Genere una autoridad certificadora autofirmada",
+    "select_option_setting_up_certificate_authority": "Seleccione una opción para configurar la autoridad certificadora que se utilizará para firmar todas las cuentas de Jami generadas en esta instancia de JAMS.",
+    "import_certificate_authority": "Importar una autoridad certificadora",
+    "must_be_60_characters_or_less": "60 caracteres o menos",
+    "username_is_required": "Se requiere un nombre de usuario",
+    "must_be_50_characters_or_less": "50 caracteres o menos",
+    "password_must_match": "Las contraseñas deben coincidir",
+    "password_confirmation_required": "Requiere confirmación de contraseña",
+    "information_appears_incorrect_connection_directory_failed": "La información proveada parece ser incorrecta, la conexión al directorio ha fallado. Verifique la información y las credenciales proveadas y vuelva a intentarlo.",
+    "identity_management": "Gestión de identidad",
+    "select_type_of_user_directory": "Seleccione el tipo de directorio de usuario que se integrará con JAMS",
+    "set_identity_parameters": "Establecer parámetros de identidad",
+    "create_administrator_user": "Crear administrador",
+    "certificate_authority_setup": "Configuración de la autoridad de certificación",
+    "server_parameters": "Parámetros del servidor",
+    "choose_a_country": "Elige un pais",
+    "active_directory_server_informations": "Información del servidor de Active Directory",
+    "port": "Puerto",
     "host": "Host",
-    "admin_username": "Admin username",
-    "domain_name": "Domain Name",
-    "yes": "Yes",
+    "admin_username": "Nombre de usuario del administrador",
+    "domain_name": "Nombre del dominio",
+    "yes": "Sí",
     "no": "No",
-    "ldap_server_information": "LDAP Server informations",
-    "server_address": "Server address",
-    "administrator_username": "Administrator username",
-    "base_dn_please_use_ldap_convention": "Base DN (Please use LDAP convention)",
-    "field_ldap_structure_contains_username": "This is the field in your LDAP structure which contains the username.",
-    "use_public_nameserver": "Use public nameserver",
-    "check_box_register_usernames_on_jami_public_nameserver": "Check this box if you want to register your usernames on Jami's public name server.",
-    "domain_is_required": "Domain is required.",
-    "5_minutes": "5 minutes",
-    "10_minutes": "10 minutes",
-    "15_minutes": "15 minutes",
-    "30_minutes": "30 minutes",
-    "60_minutes": "60 minutes",
-    "1_month": "1 Month",
-    "3_months": "3 Months",
-    "6_months": "6 Months",
-    "1_year": "1 Year",
-    "please_enter_valid_cors_domain_url": "Please enter a valid CORS domain URL.",
-    "global_parameters_cover_general_configuration_of_servers_engine": "The global parameters cover the general configuration of the server's engine.",
-    "cors_domain_name": "CORS domain name",
+    "ldap_server_information": "Información del servidor LDAP",
+    "server_address": "Dirección del servidor",
+    "administrator_username": "Nombre de usuario del administrador",
+    "base_dn_please_use_ldap_convention": "DN base (utilice la convención LDAP)",
+    "field_ldap_structure_contains_username": "Este es el campo en su estructura LDAP que contiene el nombre de usuario.",
+    "use_public_nameserver": "Usar servidor de nombres público",
+    "check_box_register_usernames_on_jami_public_nameserver": "Marque esta casilla si desea registrar nombres de usuario en el servidor de nombres públicos de Jami.",
+    "domain_is_required": "Se requiere dominio",
+    "5_minutes": "5 minutos",
+    "10_minutes": "10 minutos",
+    "15_minutes": "15 minutos",
+    "30_minutes": "30 minutos",
+    "60_minutes": "60 minutos",
+    "1_month": "1 Mes",
+    "3_months": "3 Meses",
+    "6_months": "6 Meses",
+    "1_year": "1 Año",
+    "please_enter_valid_cors_domain_url": "Ingrese una URL de dominio CORS válida.",
+    "global_parameters_cover_general_configuration_of_servers_engine": "Los parámetros globales cubren la configuración general del motor del servidor.",
+    "cors_domain_name": "Nombre de dominio CORS",
     "set_domain_of_web_cleint_server_to_connect_to_hans_admin_dashboard_and_jami_accounts_also_to_set_client_crls_ocsps": "Set the domain of the web client-server to connect to the JAMS admin dashboard and Jami accounts. It is also used to define where the clients should download CRLs and submit OCSP queries. In case you are running a proxied instance (i.e. JAMS behind IIS), please make sure to set this field correctly, otherwise devices will not be able to download CRLs or validate certificates.",
     "domain_name_of_web_client_server": "The domain name of your web client server. Requires http:// or https://",
     "domain": "Domain",
diff --git a/jams-react-client/src/locales/et/translation.json b/jams-react-client/public/locales/et/translation.json
similarity index 100%
rename from jams-react-client/src/locales/et/translation.json
rename to jams-react-client/public/locales/et/translation.json
diff --git a/jams-react-client/src/locales/fa/translation.json b/jams-react-client/public/locales/fa/translation.json
similarity index 100%
rename from jams-react-client/src/locales/fa/translation.json
rename to jams-react-client/public/locales/fa/translation.json
diff --git a/jams-react-client/src/locales/fi/translation.json b/jams-react-client/public/locales/fi/translation.json
similarity index 100%
rename from jams-react-client/src/locales/fi/translation.json
rename to jams-react-client/public/locales/fi/translation.json
diff --git a/jams-react-client/src/locales/fr/translation.json b/jams-react-client/public/locales/fr/translation.json
similarity index 100%
rename from jams-react-client/src/locales/fr/translation.json
rename to jams-react-client/public/locales/fr/translation.json
diff --git a/jams-react-client/src/locales/he/translation.json b/jams-react-client/public/locales/he/translation.json
similarity index 100%
rename from jams-react-client/src/locales/he/translation.json
rename to jams-react-client/public/locales/he/translation.json
diff --git a/jams-react-client/src/locales/hi_IN/translation.json b/jams-react-client/public/locales/hi_IN/translation.json
similarity index 100%
rename from jams-react-client/src/locales/hi_IN/translation.json
rename to jams-react-client/public/locales/hi_IN/translation.json
diff --git a/jams-react-client/src/locales/hu/translation.json b/jams-react-client/public/locales/hu/translation.json
similarity index 100%
rename from jams-react-client/src/locales/hu/translation.json
rename to jams-react-client/public/locales/hu/translation.json
diff --git a/jams-react-client/src/locales/id/translation.json b/jams-react-client/public/locales/id/translation.json
similarity index 100%
rename from jams-react-client/src/locales/id/translation.json
rename to jams-react-client/public/locales/id/translation.json
diff --git a/jams-react-client/src/locales/it/translation.json b/jams-react-client/public/locales/it/translation.json
similarity index 100%
rename from jams-react-client/src/locales/it/translation.json
rename to jams-react-client/public/locales/it/translation.json
diff --git a/jams-react-client/src/locales/ja/translation.json b/jams-react-client/public/locales/ja/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ja/translation.json
rename to jams-react-client/public/locales/ja/translation.json
diff --git a/jams-react-client/src/locales/ko/translation.json b/jams-react-client/public/locales/ko/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ko/translation.json
rename to jams-react-client/public/locales/ko/translation.json
diff --git a/jams-react-client/src/locales/lt/translation.json b/jams-react-client/public/locales/lt/translation.json
similarity index 100%
rename from jams-react-client/src/locales/lt/translation.json
rename to jams-react-client/public/locales/lt/translation.json
diff --git a/jams-react-client/src/locales/nb/translation.json b/jams-react-client/public/locales/nb/translation.json
similarity index 100%
rename from jams-react-client/src/locales/nb/translation.json
rename to jams-react-client/public/locales/nb/translation.json
diff --git a/jams-react-client/src/locales/nl/translation.json b/jams-react-client/public/locales/nl/translation.json
similarity index 100%
rename from jams-react-client/src/locales/nl/translation.json
rename to jams-react-client/public/locales/nl/translation.json
diff --git a/jams-react-client/src/locales/oc/translation.json b/jams-react-client/public/locales/oc/translation.json
similarity index 100%
rename from jams-react-client/src/locales/oc/translation.json
rename to jams-react-client/public/locales/oc/translation.json
diff --git a/jams-react-client/src/locales/pa/translation.json b/jams-react-client/public/locales/pa/translation.json
similarity index 100%
rename from jams-react-client/src/locales/pa/translation.json
rename to jams-react-client/public/locales/pa/translation.json
diff --git a/jams-react-client/src/locales/pl/translation.json b/jams-react-client/public/locales/pl/translation.json
similarity index 100%
rename from jams-react-client/src/locales/pl/translation.json
rename to jams-react-client/public/locales/pl/translation.json
diff --git a/jams-react-client/src/locales/pt/translation.json b/jams-react-client/public/locales/pt/translation.json
similarity index 100%
rename from jams-react-client/src/locales/pt/translation.json
rename to jams-react-client/public/locales/pt/translation.json
diff --git a/jams-react-client/src/locales/pt_BR/translation.json b/jams-react-client/public/locales/pt_BR/translation.json
similarity index 100%
rename from jams-react-client/src/locales/pt_BR/translation.json
rename to jams-react-client/public/locales/pt_BR/translation.json
diff --git a/jams-react-client/src/locales/ro/translation.json b/jams-react-client/public/locales/ro/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ro/translation.json
rename to jams-react-client/public/locales/ro/translation.json
diff --git a/jams-react-client/src/locales/ro_RO/translation.json b/jams-react-client/public/locales/ro_RO/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ro_RO/translation.json
rename to jams-react-client/public/locales/ro_RO/translation.json
diff --git a/jams-react-client/src/locales/ru/translation.json b/jams-react-client/public/locales/ru/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ru/translation.json
rename to jams-react-client/public/locales/ru/translation.json
diff --git a/jams-react-client/src/locales/sk/translation.json b/jams-react-client/public/locales/sk/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sk/translation.json
rename to jams-react-client/public/locales/sk/translation.json
diff --git a/jams-react-client/src/locales/sl/translation.json b/jams-react-client/public/locales/sl/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sl/translation.json
rename to jams-react-client/public/locales/sl/translation.json
diff --git a/jams-react-client/src/locales/sq_AL/translation.json b/jams-react-client/public/locales/sq_AL/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sq_AL/translation.json
rename to jams-react-client/public/locales/sq_AL/translation.json
diff --git a/jams-react-client/src/locales/sr/translation.json b/jams-react-client/public/locales/sr/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sr/translation.json
rename to jams-react-client/public/locales/sr/translation.json
diff --git a/jams-react-client/src/locales/sv/translation.json b/jams-react-client/public/locales/sv/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sv/translation.json
rename to jams-react-client/public/locales/sv/translation.json
diff --git a/jams-react-client/src/locales/sw/translation.json b/jams-react-client/public/locales/sw/translation.json
similarity index 100%
rename from jams-react-client/src/locales/sw/translation.json
rename to jams-react-client/public/locales/sw/translation.json
diff --git a/jams-react-client/src/locales/ta/translation.json b/jams-react-client/public/locales/ta/translation.json
similarity index 100%
rename from jams-react-client/src/locales/ta/translation.json
rename to jams-react-client/public/locales/ta/translation.json
diff --git a/jams-react-client/src/locales/te/translation.json b/jams-react-client/public/locales/te/translation.json
similarity index 100%
rename from jams-react-client/src/locales/te/translation.json
rename to jams-react-client/public/locales/te/translation.json
diff --git a/jams-react-client/src/locales/tr/translation.json b/jams-react-client/public/locales/tr/translation.json
similarity index 100%
rename from jams-react-client/src/locales/tr/translation.json
rename to jams-react-client/public/locales/tr/translation.json
diff --git a/jams-react-client/src/locales/tr_TR/translation.json b/jams-react-client/public/locales/tr_TR/translation.json
similarity index 100%
rename from jams-react-client/src/locales/tr_TR/translation.json
rename to jams-react-client/public/locales/tr_TR/translation.json
diff --git a/jams-react-client/src/locales/tt/translation.json b/jams-react-client/public/locales/tt/translation.json
similarity index 100%
rename from jams-react-client/src/locales/tt/translation.json
rename to jams-react-client/public/locales/tt/translation.json
diff --git a/jams-react-client/src/locales/uk/translation.json b/jams-react-client/public/locales/uk/translation.json
similarity index 100%
rename from jams-react-client/src/locales/uk/translation.json
rename to jams-react-client/public/locales/uk/translation.json
diff --git a/jams-react-client/src/locales/vi/translation.json b/jams-react-client/public/locales/vi/translation.json
similarity index 100%
rename from jams-react-client/src/locales/vi/translation.json
rename to jams-react-client/public/locales/vi/translation.json
diff --git a/jams-react-client/src/locales/zh/translation.json b/jams-react-client/public/locales/zh/translation.json
similarity index 100%
rename from jams-react-client/src/locales/zh/translation.json
rename to jams-react-client/public/locales/zh/translation.json
diff --git a/jams-react-client/src/locales/zh_TW/translation.json b/jams-react-client/public/locales/zh_TW/translation.json
similarity index 100%
rename from jams-react-client/src/locales/zh_TW/translation.json
rename to jams-react-client/public/locales/zh_TW/translation.json