diff --git a/dmp-backend/notification-service/notification-web/target/classes/certificates/elasticsearch_dev04.crt b/dmp-backend/notification-service/notification-web/target/classes/certificates/elasticsearch_dev04.crt
deleted file mode 100644
index ae8d7a7c5..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/certificates/elasticsearch_dev04.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUjCCAjqgAwIBAgIUKTnOSL0Rtnm8ZQkfSUvpQiBNGnMwDQYJKoZIhvcNAQEL
-BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
-cmF0ZWQgQ0EwHhcNMTkwOTAzMTUyMDM1WhcNMjIwOTAyMTUyMDM1WjAYMRYwFAYD
-VQQDEw1lbGFzdGljc2VhcmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAkB1OMRBRUDUxQ6fIv5gv0myKDZgVJFnEEjIjU6YjMpf/htTsvu8zdpBoWhg6
-7IsflSkUPynDG4geFjQ/WtxVeqxjnmtIB2fMDAHppX882as3tYjBlHj1sU0/OwwI
-Ga5/OtxOubGswrzCEEjIgZwTtSX2Yzx3tE2UzwjWsYwGCBM/ssN8Wc1vlqq20+Qr
-Lsggk+dXapN2wL9FABrxrJfV2SxXb2qKLKVd3EIfs+HVqIt9dVrpcFRV3Lwexg+Z
-wlJv58EPsynphczssBhMOhlmVqpRY8z88fqsbqDVdqHIF8hqn7czWFqeCRldnb7W
-LWaYaOG0Jd6SM7OpHnfNgBST4wIDAQABo3gwdjAdBgNVHQ4EFgQUCkDAcWSJ6H2G
-UFFh9dhk+mG0L08wHwYDVR0jBBgwFoAUDF2zHdVwSwxo9Z7sa9vIc4Sd+1MwKQYD
-VR0RBCIwIIIJbG9jYWxob3N0hwR/AAABgg1lbGFzdGljc2VhcmNoMAkGA1UdEwQC
-MAAwDQYJKoZIhvcNAQELBQADggEBAAQpkdkGl2H0ylgbmmNiIlrQX+U2i4ag4sJ6
-xsVR5OWxuyB/aMWhuOHkgueMh2wElufn60jK0Mh25b2U7oO/0Nq+28rhhP9HURLz
-7/TwCbLcglTAgHQPWItwn5r5WKDFNCPNpZXFU/oG5H6hUJqTvuaTN6G/PQ6V9Yp3
-J00NbPuFq8tjNAc/kQnhC7zdC/7YQ/fanHBPkvQnkGbac5+VAF/se/JYbxRpSz23
-5a+v6BDb/kjs82QgV8dzsyFmntO+Neesu9tTJurBbQD5T3xMgoGSWLgnTCq3/drl
-PMBLgUQHik629dU+7o8ePCdyULruGMR6CIBqO7ZKQASulhkxdUo=
------END CERTIFICATE-----
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/application.yml b/dmp-backend/notification-service/notification-web/target/classes/config/application.yml
deleted file mode 100644
index 06b5f37c9..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/application.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-spring:
-  jackson:
-    default-property-inclusion: non_null
-  config:
-    import: optional:classpath:config/app.env[.properties], optional:file:../config/app.env[.properties],
-      optional:classpath:config/db.yml[.yml], optional:classpath:config/db-${spring.profiles.active}.yml[.yml], optional:file:../config/db-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/permissions.yml[.yml], optional:classpath:config/permissions-${spring.profiles.active}.yml[.yml], optional:file:../config/permissions-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/errors.yml[.yml], optional:classpath:config/errors-${spring.profiles.active}.yml[.yml], optional:file:../config/errors-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/security.yml[.yml], optional:classpath:config/security-${spring.profiles.active}.yml[.yml], optional:file:../config/security-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/server.yml[.yml], optional:classpath:config/server-${spring.profiles.active}.yml[.yml], optional:file:../config/server-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/logging.yml[.yml], optional:classpath:config/logging-${spring.profiles.active}.yml[.yml], optional:file:../config/logging-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/idpclaims.yml[.yml], optional:classpath:config/idpclaims-${spring.profiles.active}.yml[.yml], optional:file:../config/idpclaims-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/cache.yml[.yml], optional:classpath:config/cache-${spring.profiles.active}.yml[.yml], optional:file:../config/cache-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/tenant.yml[.yml], optional:classpath:config/tenant-${spring.profiles.active}.yml[.yml], optional:file:../config/tenant-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/locale.yml[.yml], optional:classpath:config/locale-${spring.profiles.active}.yml[.yml], optional:file:../config/locale-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/cors.yml[.yml], optional:classpath:config/cors-${spring.profiles.active}.yml[.yml], optional:file:../config/cors-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/notification.yml[.yml], optional:classpath:config/notification-${spring.profiles.active}.yml[.yml], optional:file:../config/notification-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/email.yml[.yml], optional:classpath:config/email-${spring.profiles.active}.yml[.yml], optional:file:../config/email-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/queue.yml[.yml], optional:classpath:config/queue-${spring.profiles.active}.yml[.yml], optional:file:../config/queue-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/cipher.yml[.yml], optional:classpath:config/cipher-${spring.profiles.active}.yml[.yml], optional:file:../config/cipher-${spring.profiles.active}.yml[.yml],
-      optional:classpath:config/formatting.yml[.yml], optional:classpath:config/formatting-${spring.profiles.active}.yml[.yml], optional:file:../config/formatting-${spring.profiles.active}.yml[.yml]
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/cache.yml b/dmp-backend/notification-service/notification-web/target/classes/config/cache.yml
deleted file mode 100644
index 5b30dee77..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/cache.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-cache:
-  manager:
-    fallbackToNoOpCache: true
-    caffeineCaches:
-      - names: [ apikey ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
-      - names: [ tenantByCode ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
-      - names: [ tenantById ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 10
-        expireAfterAccessMinutes: 10
-        refreshAfterWriteMinutes: 10
-      - names: [ userBySubjectId ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 5
-        expireAfterAccessMinutes: 5
-        refreshAfterWriteMinutes: 5
-      - names: [ userAccessTenant ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 5
-        expireAfterAccessMinutes: 5
-        refreshAfterWriteMinutes: 5
-      - names: [ formattingUserProfile ]
-        allowNullValues: true
-        initialCapacity: 100
-        maximumSize: 500
-        enableRecordStats: false
-        expireAfterWriteMinutes: 1
-        expireAfterAccessMinutes: 1
-        refreshAfterWriteMinutes: 1
-    mapCaches:
-      - names: [ cacheB ]
-        allowNullValues: true
-        storeByValue: true
-  apiKey:
-    name: apikey
-    keyPattern: resolve_$keyhash$:v0
-  userBySubjectId:
-    name: userBySubjectId
-    keyPattern: user_by_subject_$subject$:v0
-  tenantByCode:
-    name: tenantByCode
-    keyPattern: tenant_by_code_$code$:v0
-  tenantById:
-    name: tenantById
-    keyPattern: tenant_by_id_$tenantId$:v0
-  userAllowedTenant:
-    name: userAccessTenant
-    keyPattern: user_access_tenant_$user_id$_$tenant_id$:v0
-  formattingUserProfileCache:
-    name: formattingUserProfile
-    keyPattern: formatting_user_profile$user_id$:v0
-  template:
-    name: template
-    key-pattern: ------
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/cipher.yml b/dmp-backend/notification-service/notification-web/target/classes/config/cipher.yml
deleted file mode 100644
index caa559296..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/cipher.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-cipher-profiles:
-  profile-map:
-    configuration-profile-name: "configuration"
-    queue-profile-name: "queue"
-    notification-profile-name: "queue"
-
-cipher:
-#  salted-hash:
-#    default-o: null
-#    options: null
-  symetric-encryption:
-    default-o: null
-    options:
-      configuration:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_CONFIGURATION_AES_IV:}
-      queue:
-        aes:
-          key: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_KEY:}
-          iv: ${CIPHER_SYMETRIC_ENCRYPTION_QUEUE_AES_IV:}
-  masking:
-    default: null
-    options:
-      configuration:
-        character: "*"
-        clear-begining: 2
-        clear-ending: 4
-        at-least-percentage: 70
-  digital-signature:
-    default: null
-    options:
-      configuration:
-        certificate-path: null
-        certificate-password: null
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/cors-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/cors-devel.yml
deleted file mode 100644
index 3e9227ef3..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/cors-devel.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-web:
-  cors:
-    allowed-origins: [ http://localhost, http://localhost:4200 ]
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/cors.yml b/dmp-backend/notification-service/notification-web/target/classes/config/cors.yml
deleted file mode 100644
index 3774f14d4..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/cors.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-web:
-  cors:
-    enabled: true
-    allowed-methods: [ HEAD, GET, POST, PUT, DELETE, PATCH ]
-    allowed-headers: [ Authorization, Cache-Control, Content-Type, Content-Disposition, x-tenant ]
-    exposed-headers: [ Authorization, Cache-Control, Content-Type, Content-Disposition ]
-    allow-credentials: false
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/db-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/db-devel.yml
deleted file mode 100644
index 22a089fbd..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/db-devel.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-spring:
-  jpa:
-    show-sql: true
-    properties:
-      hibernate:
-        show_sql: true
-        format_sql: false
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/db.yml b/dmp-backend/notification-service/notification-web/target/classes/config/db.yml
deleted file mode 100644
index aa3caed0b..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/db.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-spring:
-  jpa:
-    properties:
-      hibernate:
-        ddl-auto: validate
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-    hibernate:
-      naming:
-        physical-strategy: gr.cite.notification.config.db.PrefixPhysicalNamingStrategy
-        implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
-  datasource:
-    url: ${DB_CONNECTION_STRING}
-    username: ${DB_USER}
-    password: ${DB_PASSWORD}
-    driver-class-name: org.postgresql.Driver
-    hikari:
-      connection-timeout: 30000
-      minimum-idle: 3
-      maximum-pool-size: 5
-      idle-timeout: 600000
-      max-lifetime: 1800000
-
-naming-strategy:
-  prefix: ntf_
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/email.yml b/dmp-backend/notification-service/notification-web/target/classes/config/email.yml
deleted file mode 100644
index fb7c94ba0..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/email.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
-  mail:
-    host: ${MAIL_HOST:}
-    port: ${MAIL_PORT:}
-    username: ${MAIL_USERNAME:}
-    password: ${MAIL_PASSWORD:}
-    properties:
-      mail:
-        smtp:
-          auth: ${MAIL_AUTH:}
-          starttls:
-            enable: ${MAIL_TLS:}
-email:
-  address: ${MAIL_ADDRESS:}
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/errors.yml b/dmp-backend/notification-service/notification-web/target/classes/config/errors.yml
deleted file mode 100644
index 79762a9e7..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/errors.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-error-thesaurus:
-  hash-conflict:
-    code: 100
-    message: there is a hash conflict for the item modified. please reload to get the latest changes
-  forbidden:
-    code: 101
-    message: insufficient rights
-  system-error:
-    code: 102
-    message: an unexpected system error occurred
-  missing-tenant:
-    code: 103
-    message: tenant scope not provided
-  invalid-api-key:
-    code: 104
-    message: provided APIKey not valid
-  stale-api-key:
-    code: 105
-    message: there was a problem authorizing you with your API key. Please try again. Contact the system administrator if the problem persists
-  model-validation:
-    code: 106
-    message: validation error
-  sensitive-info:
-    code: 107
-    message: you are attempting to access sensitive information. please don't do that
-  non-person-principal:
-    code: 108
-    message: the operation is available only to person users
-  blocking-consent:
-    code: 113
-    message: user consents are not sufficient to complete the operation
-  single-tenant-configuration-per-type-supported:
-    code: 116
-    message: a single tenant configuration entry per config type is supported
-  incompatible-tenant-configuration-types:
-    code: 117
-    message: the provided tenant configuration type is incompatible
-  missing-totp-token:
-    code: 118
-    message: totp token not provided
-  overlapping-tenant-configuration-notifier-list:
-    code: 119
-    message: Overlapping Tenant Configuration Notifier List
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/formatting.yml b/dmp-backend/notification-service/notification-web/target/classes/config/formatting.yml
deleted file mode 100644
index abdc31184..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/formatting.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-formatting:
-  options:
-    integer-format: "%,d"
-    decimal-digits-round: 2
-    decimal-format: "#0.00"
-    date-time-format: "YYYY-MM-dd'T'HH:mm:ss"
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/idpclaims.yml b/dmp-backend/notification-service/notification-web/target/classes/config/idpclaims.yml
deleted file mode 100644
index 3372e4ca7..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/idpclaims.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-idpclient:
-  claims:
-    mapping:
-      Subject:
-        - type: sub
-      Name:
-        - type: name
-      Client:
-        - type: client_id
-      AuthenticationMethod:
-        - type: amr
-      NotBefore:
-        - type: nbf
-      AuthenticatedAt:
-        - type: auth_time
-      ExpiresAt:
-        - type: exp
-      Email:
-        - type: email
-      Roles:
-        - type: resource_access
-          path: dmp_web.roles
-      Scope:
-        - type: scope
-      AccessToken:
-        - type: x-access-token
-          visibility: SENSITIVE
-      IssuedAt:
-        - type: iat
-      Issuer:
-        - type: iss
-      Audience:
-        - type: aud
-      TokenType:
-        - type: typ
-      AuthorizedParty:
-        - type: azp
-      Authorities:
-        - type: authorities
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/locale.yml b/dmp-backend/notification-service/notification-web/target/classes/config/locale.yml
deleted file mode 100644
index b09c59e53..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/locale.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-locale:
-  timezone: UTC
-  language: en
-  culture: en-US
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/logging-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/logging-devel.yml
deleted file mode 100644
index 2f565c0d7..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/logging-devel.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-logging:
-  config: classpath:logging/logback-dev.xml
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/logging.yml b/dmp-backend/notification-service/notification-web/target/classes/config/logging.yml
deleted file mode 100644
index 56e152d3f..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/logging.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-logging:
-  context:
-    request:
-      requestIdKey: req.id
-      requestRemoteHostKey: req.remoteHost
-      requestUriKey: req.requestURI
-      requestQueryStringKey: req.queryString
-      requestUrlKey : req.requestURL
-      requestMethodKey: req.method
-      requestUserAgentKey: req.userAgent
-      requestForwardedForKey: req.xForwardedFor
-      requestSchemeKey: req.scheme
-      requestRemoteAddressKey: req.remoteAddr
-      requestRemotePortKey: req.remotePort
-      requestRemoteUserKey: req.remoteUser
-    principal:
-      subjectKey: usr.subject
-      nameKey: usr.name
-      clientKey: usr.client
-audit:
-  enable: true
-  requestRemoteHostKey: req.remoteHost
-  requestUriKey: req.requestURI
-  requestQueryStringKey: req.queryString
-  requestUrlKey : req.requestURL
-  requestMethodKey: req.method
-  requestUserAgentKey: req.userAgent
-  requestForwardedForKey: req.xForwardedFor
-  requestSchemeKey: req.scheme
-  requestRemoteAddressKey: req.remoteAddr
-  requestRemotePortKey: req.remotePort
-  requestRemoteUserKey: req.remoteUser
-  principalSubjectKey: usr.subject
-  principalNameKey: usr.name
-  principalClientKey: usr.client
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/notification-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/notification-devel.yml
deleted file mode 100644
index fff9c2a54..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/notification-devel.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-notification:
-  staticFields:
-    fields: 
-      - key: "{installation-url}"
-        type: "String"
-        value: "http://localhost:42000"
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/notification.yml b/dmp-backend/notification-service/notification-web/target/classes/config/notification.yml
deleted file mode 100644
index 7192cf334..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/notification.yml
+++ /dev/null
@@ -1,501 +0,0 @@
-notification:
-  task:
-    processor:
-      enable: true
-      interval-seconds: 30
-      options:
-        retry-threshold: 300
-        max-retry-delay-seconds: 10800
-        too-old-to-send-seconds: 36000
-        too-old-to-track-seconds: 604800
-      overrides: []
-  resolver:
-    global-policies:
-        - #dmpInvitationExternalUser
-          type: 065DEECD-21BB-44AF-9983-E660FDF24BC4
-          contacts: [ email ]
-        - #dmpInvitationExistingUser
-          type: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-          contacts: [ inapp, email ]
-        - #dpmModified
-          type: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-          contacts: [ email ]
-        - #dmpFinalised
-          type: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-          contacts: [ email ]
-        - #descriptionModified
-          type: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-          contacts: [ email ]
-        - #descriptionFinalised
-          type: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-          contacts: [ email ]
-        - #mergeAcountConfirmation
-          type: BFE68845-CB05-4C5A-A03D-29161A7C9660
-          contacts: [ email ]
-        - #removeCredentialConfirmation
-          type: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-          contacts: [ email ]
-        - #dmpDeposit
-          type: 55736F7A-83AB-4190-AF43-9D031A6F9612
-          contacts: [ email ]
-        - #descriptionTemplateInvitation
-          type: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-          contacts: [ email ]
-        - #contactSupportType
-          type: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
-          contacts: [ email ]
-        - #publicContactSupportType
-          type: B542B606-ACC6-4629-ADEF-4D8EE2F01222
-          contacts: [ email ]
-  ad-hoc-config:
-    ad-hoc-notification-type: null
-  message:
-    email:
-      flows:
-          - #dmpInvitationExternalUser
-            key: 065DEECD-21BB-44AF-9983-E660FDF24BC4
-            subject-path: classpath:notification_templates/dmpinvitationexternaluser/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpinvitationexternaluser/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{dmpname}", "{dmprole}", "{installation-url}", "{confirmationToken}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{dmpname}]': null
-                '[{dmprole}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpInvitationExistingUser
-            key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-            subject-path: classpath:notification_templates/dmpinvitationexistinguser/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpinvitationexistinguser/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}"]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{dmpname}]': null
-                '[{dmprole}]': null
-                '[{reasonName}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpModified
-            key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-            subject-path: classpath:notification_templates/dmpmodified/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpmodified/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #dmpFinalised
-            key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-            subject-path: classpath:notification_templates/dmpfinalised/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpfinalised/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #desriptionModified
-            key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-            subject-path: classpath:notification_templates/descriptionmodified/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptionmodified/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #descriptionFinalised
-            key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-            subject-path: classpath:notification_templates/descriptionfinalised/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptionfinalised/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -  #mergeAccountConfirmation
-            key: BFE68845-CB05-4C5A-A03D-29161A7C9660
-            subject-path: classpath:notification_templates/mergeacountconfirmation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/mergeacountconfirmation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
-              optional:
-                - key: "{expiration_time}"
-                  value: ---
-              formatting:
-                '[{userName}]': null
-                '[{installation-url}]': null
-                '[{expiration_time}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          - #removeCredentialConfirmation
-            key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-            subject-path: classpath:notification_templates/removecredentialconfirmation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{installation-url}", "{confirmationToken}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/removecredentialconfirmation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ ]
-              optional:
-                - key: "{email}"
-                  value: email
-                - key: "{expiration_time}"
-                  value: --
-              formatting:
-                '[{email}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -   #dmpDeposit
-            key: 55736F7A-83AB-4190-AF43-9D031A6F9612
-            subject-path: classpath:notification_templates/dmpdeposit/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/dmpdeposit/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{reasonName}]': null
-                '[{name}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #descriptionTemplateInvitation
-            key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-            subject-path: classpath:notification_templates/descriptiontemplateinvitation/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ ]
-              optional: [ ]
-            body-path: classpath:notification_templates/descriptiontemplateinvitation/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
-              optional:
-                - key: "{recipient}"
-                  value:
-              formatting:
-                '[{templateName}]': null
-                '[{recipient}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #contactSupportType
-            key: 5B1D6C52-88F9-418B-9B8A-6F1F963D9EAD
-            subject-path: classpath:notification_templates/contactsupport/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{subject}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/contactsupport/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{description}", "{email}" ]
-              formatting:
-                '[{subject}]': null
-                '[{description}]': null
-                '[{email}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-          -    #publicContactSupportType
-            key: B542B606-ACC6-4629-ADEF-4D8EE2F01222
-            subject-path: classpath:notification_templates/publiccontactsupport/email/subject.{language}.txt
-            subject-field-options:
-              mandatory: [ "{subject}" ]
-              optional: [ ]
-            body-path: classpath:notification_templates/publiccontactsupport/email/body.{language}.html
-            body-field-options:
-              mandatory: [ "{description}", "{email}", "{name}" ]
-              formatting:
-                '[{subject}]': null
-                '[{description}]': null
-                '[{email}]': null
-                '[{name}]': null
-            cc: [ ]
-            cc-mode: 0
-            bcc: [ ]
-            bcc-mode: 0
-            allow-attachments: false
-            cipher-fields: [ ]
-      template-cache:
-        prefix: ${CACHE_DISAMBIGUATION:}
-        key-pattern: "{prefix}:Notification_Message_Email_Template:{key}:v0"
-    in-app:
-      flows:
-        - #dmpInvitationExistingUser
-          key: 4904dea2-5079-46d3-83be-3a19c9ab45dc
-          subject-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpinvitationexistinguser/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{dmpname}", "{dmprole}", "{reasonName}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{dmpname}]': null
-              '[{dmprole}]': null
-              '[{reasonName}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpModified
-          key: 4542262A-22F8-4BAA-9DB6-1C8E70AC1DBB
-          subject-path: classpath:notification_templates/dmpmodified/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpmodified/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpFinalised
-          key: 90DB0B46-42DE-BD89-AEBF-6F27EFEB256E
-          subject-path: classpath:notification_templates/dmpfinalised/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpfinalised/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #desriptionModified
-          key: 4FDBFA80-7A71-4A69-B854-67CBB70648F1
-          subject-path: classpath:notification_templates/descriptionmodified/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptionmodified/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #descriptionFinalised
-          key: 33790bad-94d4-488a-8ee2-7f6295ca18ea
-          subject-path: classpath:notification_templates/descriptionfinalised/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptionfinalised/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #mergeAccountConfirmation
-          key: BFE68845-CB05-4C5A-A03D-29161A7C9660
-          subject-path: classpath:notification_templates/mergeacountconfirmation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/mergeacountconfirmation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
-            optional:
-              - key: "{expiration_time}"
-                value: ---
-            formatting:
-              '[{userName}]': null
-              '[{installation-url}]': null
-              '[{confirmationToken}]': null
-              '[{expiration_time}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #removeCredentialConfirmation
-          key: C9BC3F16-057E-4BBA-8A5F-36BD835E5604
-          subject-path: classpath:notification_templates/removecredentialconfirmation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ "{installation-url}", "{confirmationToken}" ]
-            optional: [ ]
-          body-path: classpath:notification_templates/removecredentialconfirmation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ ]
-            optional:
-              - key: "{email}"
-                value: email
-              - key: "{expiration_time}"
-                value: --
-            formatting:
-              '[{email}]': null
-              '[{expiration_time}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #dmpDeposit
-          key: 55736F7A-83AB-4190-AF43-9D031A6F9612
-          subject-path: classpath:notification_templates/dmpdeposit/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/dmpdeposit/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{reasonName}", "{name}", "{installation-url}", "{id}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{reasonName}]': null
-              '[{name}]': null
-              '[{installation-url}]': null
-              '[{id}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-        - #descriptionTemplateInvitation
-          key: 223BB607-EFA1-4CE7-99EC-4BEABFEF9A8B
-          subject-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/subject.{language}.txt
-          subject-field-options:
-            mandatory: [ ]
-            optional: [ ]
-          body-path: classpath:notification_templates/descriptiontemplateinvitation/inapp/body.{language}.html
-          body-field-options:
-            mandatory: [ "{templateName}", "{installation-url}", "{templateID}" ]
-            optional:
-              - key: "{recipient}"
-                value:
-            formatting:
-              '[{templateName}]': null
-              '[{installation-url}]': null
-              '[{templateID}]': null
-              '[{recipient}]': null
-          priority-key: null
-          cipher-fields: [ ]
-      template-cache:
-        prefix: ${CACHE_DISAMBIGUATION:}
-        key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"
-  override-cache:
-    template-cache:
-      prefix: ${CACHE_DISAMBIGUATION:}
-      key-pattern: "{prefix}:Notification_Override_Template:{tenant}:{type}:{channel}:{{language}}:v0"
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/permissions.yml b/dmp-backend/notification-service/notification-web/target/classes/config/permissions.yml
deleted file mode 100644
index e93f4f3af..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/permissions.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-permissions:
-  extendedClaims: [ ]
-  policies:
-
-    # Tenants
-    BrowseTenant:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    EditTenant:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    DeleteTenant:
-      roles:
-        - ic-sti-superuser
-      claims: [ ]
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    AllowNoTenant:
-      roles:
-        - ic-sti-superuser
-      claims: [ ]
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    # Users
-    BrowseUser:
-      roles:
-        - ic-sti-superuser
-        - tenantadmin
-      clients: [ ]
-      allowAnonymous: true
-      allowAuthenticated: false
-    EditUser:
-      roles:
-        - admin
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    DeleteUser:
-      roles:
-        - ic-sti-superuser
-      claims: [ ]
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    # UserContactInfo
-    BrowseUserContactInfo:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: true
-      allowAuthenticated: false
-    EditUserContactInfo:
-      roles:
-        - ic-sti-superuser
-        - user
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    DeleteUserContactInfo:
-      roles:
-        - ic-sti-superuser
-      claims: [ ]
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    #Notification
-    BrowseNotification:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: true
-      allowAuthenticated: false
-    EditNotification:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: true
-      allowAuthenticated: false
-    DeleteNotification:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    #Tenant Configuration
-    BrowseTenantConfiguration:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    EditTenantConfiguration:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    #User Notification Preference
-    BrowseUserNotificationPreference:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: true
-      allowAuthenticated: false
-    EditUserNotificationPreference:
-      roles:
-        - ic-sti-superuser
-        - user
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-  
-    # ViewPage Permissions
-    ViewNotificationPage:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    ViewNotificationEventRulePage:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    ViewInAppNotificationPage:
-      roles:
-        - ic-sti-superuser
-        - tenantadmin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    ViewNotificationTemplatePage:
-      roles:
-        - ic-sti-superuser
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-
-    # Notification Template Permissions
-    BrowseNotificationTemplate:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    EditNotificationTemplate:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    DeleteNotificationTemplate:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-
-    # In App Notification Permissions
-    BrowseInAppNotification:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
-    DeleteInAppNotification:
-      roles:
-        - Admin
-      clients: [ ]
-      allowAnonymous: false
-      allowAuthenticated: false
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/queue-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/queue-devel.yml
deleted file mode 100644
index 1c761d9e5..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/queue-devel.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-queue:
-  rabbitmq:
-    enable: true
-    durable: true
-    queue: cite_dmp_devel_notification_inbox_queue
-    exchange: cite_dmp_devel_queue
-    listenerEnabled: true
-    publisherEnabled: true
-  task:
-    publisher:
-      enable: true
-      options:
-        exchange: cite_dmp_devel_queue
-      rabbitmq:
-        enable: true
-    listener:
-      enable: true
-      options:
-        exchange: cite_dmp_devel_queue
-      rabbitmq:
-        enable: true
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/queue.yml b/dmp-backend/notification-service/notification-web/target/classes/config/queue.yml
deleted file mode 100644
index 6a5cdd471..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/queue.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-spring:
-  rabbitmq:
-    host: ${RABBIT_HOST}
-    port: ${RABBIT_PORT}
-    username: ${RABBIT_USER}
-    password: ${RABBIT_PASS}
-    ssl:
-      enabled: false
-queue:
-  rabbitmq:
-    enable: false
-    app-id: ${QUEUE_APP_ID}
-    durable: null
-    queue: null
-    exchange: null
-    listenerEnabled: true
-    publisherEnabled: true
-    #TODO
-    connection-recovery:
-      enable: true
-      network-recovery-interval: 5000
-      unreachable-recovery-interval: 5000
-  task:
-    publisher:
-      enable: false
-      options:
-        exchange: null
-        forget-me-completed-topic: forgetme.completed
-        what-you-know-about-me-completed-topic: whatyouknowaboutme.completed
-        generate-file-topic: generate.file
-      rabbitmq:
-        enable: false
-        interval-seconds: 30
-        options:
-          retry-threashold: 100
-          retry-delay-step-seconds: 300
-          max-retry-delay-seconds: 10800
-          too-old-to-send-seconds: 604800
-          confirm-timeout-seconds: 30
-    listener:
-      enable: false
-      options:
-        exchange: null
-        notify-topic: notification.notify
-        tenant-removal-topic: tenant.remove
-        tenant-touched-topic: tenant.touch
-        user-removal-topic: user.remove
-        user-touched-topic: user.touch
-      rabbitmq:
-        enable: false
-        interval-seconds: 30
-        options:
-          retry-threashold: 100
-          retry-delay-step-seconds: 300
-          max-retry-delay-seconds: 10800
-          too-old-to-send-seconds: 604800
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/security.yml b/dmp-backend/notification-service/notification-web/target/classes/config/security.yml
deleted file mode 100644
index 3024921aa..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/security.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-web:
-  security:
-    enabled: true
-    authorized-endpoints: [ api ]
-    allowed-endpoints: [ public, dataset, master-item, test ]
-    idp:
-      api-key:
-        enabled: true
-        authorization-header: Authorization
-        client-id: ${IDP_APIKEY_CLIENT_ID}
-        client-secret: ${IDP_APIKEY_CLIENT_SECRET}
-        scope: ${IDP_APIKEY_SCOPE}
-      resource:
-        token-type: JWT
-        opaque:
-          client-id: ${IDP_OPAQUE_CLIENT_ID}
-          client-secret: ${IDP_OPAQUE_CLIENT_SECRET}
-        jwt:
-          claims: [ role, x-role ]
-          issuer-uri: ${IDP_ISSUER_URI:}
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/server-devel.yml b/dmp-backend/notification-service/notification-web/target/classes/config/server-devel.yml
deleted file mode 100644
index 2a628f82f..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/server-devel.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-server:
-  forward-headers-strategy: FRAMEWORK
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/server.yml b/dmp-backend/notification-service/notification-web/target/classes/config/server.yml
deleted file mode 100644
index bc9a15d9f..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/server.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-server:
-  port: ${WEB_PORT}
-  forward-headers-strategy: NONE
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/config/tenant.yml b/dmp-backend/notification-service/notification-web/target/classes/config/tenant.yml
deleted file mode 100644
index 7fbc2f91c..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/config/tenant.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-tenant:
-  multitenancy:
-    is-multitenant: false
-  interceptor:
-    client-claims-prefix: client_
-    white-listed-clients: [ ]
-    enforce-trusted-tenant: false
-    white-listed-endpoints: [ '/api/principal/my-tenants',  '/api/principal/me','/api/user/user-settings', '/error', '/api/tenant-request' ]
diff --git a/dmp-backend/notification-service/notification-web/target/classes/logging/logback-dev.xml b/dmp-backend/notification-service/notification-web/target/classes/logging/logback-dev.xml
deleted file mode 100644
index 0aaad5f31..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/logging/logback-dev.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="true">
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>%date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n</Pattern>
-		</encoder>
-	</appender>
-
-	<appender name="TROUBLESHOOTING" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>logs/logging.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>logs/logging.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<maxHistory>15</maxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>%date{ISO8601} [%thread] %-5level %logger{36} [%X{req.id}] - %message%n</Pattern>
-		</encoder>
-	</appender>
-
-	<appender name="AUDITING" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>logs/auditing.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>logs/auditing.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>100MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-			<maxHistory>15</maxHistory>
-		</rollingPolicy>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>%date{ISO8601} - %X{req.id} - %message%n</Pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.springframework.web" level="INFO" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="org.hibernate" level="INFO" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="gr.cite" level="DEBUG" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="org.springframework.data.elasticsearch.client.WIRE" level="TRACE" additivity="false">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<logger name="audit" level="INFO" additivity="false">
-		<appender-ref ref="AUDITING"/>
-		<appender-ref ref="STDOUT"/>
-	</logger>
-	<root level="info">
-		<appender-ref ref="TROUBLESHOOTING"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/dmp-backend/notification-service/notification-web/target/classes/messages/messages.properties b/dmp-backend/notification-service/notification-web/target/classes/messages/messages.properties
deleted file mode 100644
index 93d6cd27a..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/messages/messages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-validation.empty=Value cannot be empty
-validation.hashempty=Hash must be set
-validation.lowerthanmin=Value must be larger than {value}
-validation.largerthanmax=Value must be less than {value}
-validation.invalidid=Not valid id
-General_ItemNotFound=Item {0} of type {1} not found
-Validation_Required={0} is required
-Validation_OverPosting=Too much info
-Validation_MaxLength={0} too long
-Validation_UnexpectedValue=Unexpected value in field {0}
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/messages/messages_el.properties b/dmp-backend/notification-service/notification-web/target/classes/messages/messages_el.properties
deleted file mode 100644
index 4d060cc58..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/messages/messages_el.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-validation.empty=el-Value cannot be empty
-validation.hashempty=el-Hash must be set
-validation.lowerthanmin=el-Value must be larger than {value}
-validation.largerthanmax=el-Value must be less than {value}
-validation.invalidid=el-Not valid id
-General_ItemNotFound=el-Item {0} of type {1} not found
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/body.en.html
deleted file mode 100644
index b7607774e..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/body.en.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-</head>
-<body class="">
-{description}
-<br/>
-<br/>
-Send by user: {email}
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/subject.en.txt
deleted file mode 100644
index 052f2db8c..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/contactsupport/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - {subject}
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/body.en.html
deleted file mode 100644
index 7025e58bf..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just made changes to the Description {name}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/descriptions/edit/{id}" target="_blank">Click here to view it.</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/subject.en.txt
deleted file mode 100644
index 440dc3c4f..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptionmodified/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Description Modified
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/body.en.html
deleted file mode 100644
index 8c2ac8ab7..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/body.en.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>You have been invited to co-develop the Template {templateName}.</p>
-                                        <p>Click the button to redirect to {templateName}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/description-templates/{templateID}" target="_blank">{templateName}</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/subject.en.txt
deleted file mode 100644
index f634a5493..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descriptiontemplateinvitation/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Description Template Invite
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/body.en.html
deleted file mode 100644
index f34f75c23..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just finalised the Description {name}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/descriptions/edit/{id}" target="_blank">Click here to view it.</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/subject.en.txt
deleted file mode 100644
index 76e26cfec..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/descrptionfinalised/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Description Finalised
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/body.en.html
deleted file mode 100644
index c80220834..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just publish the {name}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/{path}/{id}" target="_blank">Click here to view it.</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/subject.en.txt
deleted file mode 100644
index 5176c62fa..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpdeposit/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Dmp Deposit
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/body.en.html
deleted file mode 100644
index 3e00fce2d..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just finalised the Dmp {name}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Click here to view it.</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/subject.en.txt
deleted file mode 100644
index 9332be920..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpfinalised/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Dmp Finalised
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/body.en.html
deleted file mode 100644
index 75a586097..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-        /* -------------------------------------
-            GLOBAL RESETS
-        ------------------------------------- */
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%; }
-        body {
-            background-color: #f6f6f6;
-            font-family: sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%; }
-        table {
-            border-collapse: separate;
-            mso-table-lspace: 0pt;
-            mso-table-rspace: 0pt;
-            width: 100%; }
-        table td {
-            font-family: sans-serif;
-            font-size: 14px;
-            vertical-align: top; }
-        /* -------------------------------------
-            BODY & CONTAINER
-        ------------------------------------- */
-        .body {
-            background-color: #f6f6f6;
-            width: 100%; }
-        /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-        .container {
-            display: block;
-            Margin: 0 auto !important;
-            /* makes it centered */
-            max-width: 580px;
-            padding: 10px;
-            width: 580px; }
-        /* This should also be a block element, so that it will fill 100% of the .container */
-        .content {
-            box-sizing: border-box;
-            display: block;
-            Margin: 0 auto;
-            max-width: 580px;
-            padding: 10px; }
-        /* -------------------------------------
-            HEADER, FOOTER, MAIN
-        ------------------------------------- */
-        .main {
-            background: #ffffff;
-            border-radius: 3px;
-            width: 100%; }
-        .wrapper {
-            box-sizing: border-box;
-            padding: 20px; }
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-        .footer {
-            clear: both;
-            Margin-top: 10px;
-            text-align: center;
-            width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #999999;
-            font-size: 12px;
-            text-align: center; }
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #000000;
-            font-family: sans-serif;
-            font-weight: 400;
-            line-height: 1.4;
-            margin: 0;
-            Margin-bottom: 30px; }
-        h1 {
-            font-size: 35px;
-            font-weight: 300;
-            text-align: center;
-            text-transform: capitalize; }
-        p,
-        ul,
-        ol {
-            font-family: sans-serif;
-            font-size: 14px;
-            font-weight: normal;
-            margin: 0;
-            Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px; }
-        a {
-            color: #3498db;
-            text-decoration: underline; }
-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-        .btn {
-            box-sizing: border-box;
-            width: 100%; }
-        .btn > tbody > tr > td {
-            padding-bottom: 15px; }
-        .btn table {
-            width: auto; }
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 5px;
-            text-align: center; }
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #3498db;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #3498db;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 25px;
-            text-decoration: none;
-            text-transform: capitalize; }
-        .btn-primary table td {
-            background-color: #3498db; }
-        .btn-primary a {
-            background-color: #3498db;
-            border-color: #3498db;
-            color: #ffffff; }
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-        .last {
-            margin-bottom: 0; }
-        .first {
-            margin-top: 0; }
-        .align-center {
-            text-align: center; }
-        .align-right {
-            text-align: right; }
-        .align-left {
-            text-align: left; }
-        .clear {
-            clear: both; }
-        .mt0 {
-            margin-top: 0; }
-        .mb0 {
-            margin-bottom: 0; }
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            mso-hide: all;
-            visibility: hidden;
-            width: 0; }
-        .powered-by a {
-            text-decoration: none; }
-        hr {
-            border: 0;
-            border-bottom: 1px solid #f6f6f6;
-            Margin: 20px 0; }
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-        @media only screen and (max-width: 620px) {
-            table[class=body] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important; }
-            table[class=body] p,
-            table[class=body] ul,
-            table[class=body] ol,
-            table[class=body] td,
-            table[class=body] span,
-            table[class=body] a {
-                font-size: 16px !important; }
-            table[class=body] .wrapper,
-            table[class=body] .article {
-                padding: 10px !important; }
-            table[class=body] .content {
-                padding: 0 !important; }
-            table[class=body] .container {
-                padding: 0 !important;
-                width: 100% !important; }
-            table[class=body] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important; }
-            table[class=body] .btn table {
-                width: 100% !important; }
-            table[class=body] .btn a {
-                width: 100% !important; }
-            table[class=body] .img-responsive {
-                height: auto !important;
-                max-width: 100% !important;
-                width: auto !important; }}
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-        @media all {
-            .ExternalClass {
-                width: 100%; }
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%; }
-            .apple-link a {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important; }
-            .btn-primary table td:hover {
-                background-color: #34495e !important; }
-            .btn-primary a:hover {
-                background-color: #34495e !important;
-                border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just add you to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
-                                        <p>Click the button to redirect to {dmpname}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Join</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/subject.en.txt
deleted file mode 100644
index 2c36d1524..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Data Management Plan Invite
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/body.en.html
deleted file mode 100644
index 75a586097..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-        /* -------------------------------------
-            GLOBAL RESETS
-        ------------------------------------- */
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%; }
-        body {
-            background-color: #f6f6f6;
-            font-family: sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%; }
-        table {
-            border-collapse: separate;
-            mso-table-lspace: 0pt;
-            mso-table-rspace: 0pt;
-            width: 100%; }
-        table td {
-            font-family: sans-serif;
-            font-size: 14px;
-            vertical-align: top; }
-        /* -------------------------------------
-            BODY & CONTAINER
-        ------------------------------------- */
-        .body {
-            background-color: #f6f6f6;
-            width: 100%; }
-        /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-        .container {
-            display: block;
-            Margin: 0 auto !important;
-            /* makes it centered */
-            max-width: 580px;
-            padding: 10px;
-            width: 580px; }
-        /* This should also be a block element, so that it will fill 100% of the .container */
-        .content {
-            box-sizing: border-box;
-            display: block;
-            Margin: 0 auto;
-            max-width: 580px;
-            padding: 10px; }
-        /* -------------------------------------
-            HEADER, FOOTER, MAIN
-        ------------------------------------- */
-        .main {
-            background: #ffffff;
-            border-radius: 3px;
-            width: 100%; }
-        .wrapper {
-            box-sizing: border-box;
-            padding: 20px; }
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-        .footer {
-            clear: both;
-            Margin-top: 10px;
-            text-align: center;
-            width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #999999;
-            font-size: 12px;
-            text-align: center; }
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #000000;
-            font-family: sans-serif;
-            font-weight: 400;
-            line-height: 1.4;
-            margin: 0;
-            Margin-bottom: 30px; }
-        h1 {
-            font-size: 35px;
-            font-weight: 300;
-            text-align: center;
-            text-transform: capitalize; }
-        p,
-        ul,
-        ol {
-            font-family: sans-serif;
-            font-size: 14px;
-            font-weight: normal;
-            margin: 0;
-            Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px; }
-        a {
-            color: #3498db;
-            text-decoration: underline; }
-        /* -------------------------------------
-            BUTTONS
-        ------------------------------------- */
-        .btn {
-            box-sizing: border-box;
-            width: 100%; }
-        .btn > tbody > tr > td {
-            padding-bottom: 15px; }
-        .btn table {
-            width: auto; }
-        .btn table td {
-            background-color: #ffffff;
-            border-radius: 5px;
-            text-align: center; }
-        .btn a {
-            background-color: #ffffff;
-            border: solid 1px #3498db;
-            border-radius: 5px;
-            box-sizing: border-box;
-            color: #3498db;
-            cursor: pointer;
-            display: inline-block;
-            font-size: 14px;
-            font-weight: bold;
-            margin: 0;
-            padding: 12px 25px;
-            text-decoration: none;
-            text-transform: capitalize; }
-        .btn-primary table td {
-            background-color: #3498db; }
-        .btn-primary a {
-            background-color: #3498db;
-            border-color: #3498db;
-            color: #ffffff; }
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-        .last {
-            margin-bottom: 0; }
-        .first {
-            margin-top: 0; }
-        .align-center {
-            text-align: center; }
-        .align-right {
-            text-align: right; }
-        .align-left {
-            text-align: left; }
-        .clear {
-            clear: both; }
-        .mt0 {
-            margin-top: 0; }
-        .mb0 {
-            margin-bottom: 0; }
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            mso-hide: all;
-            visibility: hidden;
-            width: 0; }
-        .powered-by a {
-            text-decoration: none; }
-        hr {
-            border: 0;
-            border-bottom: 1px solid #f6f6f6;
-            Margin: 20px 0; }
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-        @media only screen and (max-width: 620px) {
-            table[class=body] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important; }
-            table[class=body] p,
-            table[class=body] ul,
-            table[class=body] ol,
-            table[class=body] td,
-            table[class=body] span,
-            table[class=body] a {
-                font-size: 16px !important; }
-            table[class=body] .wrapper,
-            table[class=body] .article {
-                padding: 10px !important; }
-            table[class=body] .content {
-                padding: 0 !important; }
-            table[class=body] .container {
-                padding: 0 !important;
-                width: 100% !important; }
-            table[class=body] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important; }
-            table[class=body] .btn table {
-                width: 100% !important; }
-            table[class=body] .btn a {
-                width: 100% !important; }
-            table[class=body] .img-responsive {
-                height: auto !important;
-                max-width: 100% !important;
-                width: auto !important; }}
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-        @media all {
-            .ExternalClass {
-                width: 100%; }
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%; }
-            .apple-link a {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important; }
-            .btn-primary table td:hover {
-                background-color: #34495e !important; }
-            .btn-primary a:hover {
-                background-color: #34495e !important;
-                border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just add you to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
-                                        <p>Click the button to redirect to {dmpname}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Join</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt
deleted file mode 100644
index 2c36d1524..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Data Management Plan Invite
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/body.en.html
deleted file mode 100644
index f1d780241..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/body.en.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>You have been invited to collaborate to Data Management plan {dmpname} with role {dmprole}.</p>
-                                        <p>Click the button to redirect to {dmpname}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/plans/invitation/{confirmationToken}" target="_blank">Join</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/subject.en.txt
deleted file mode 100644
index 2c36d1524..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpinvitationexternaluser/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Data Management Plan Invite
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/body.en.html
deleted file mode 100644
index 7a36dccba..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <p>Dear {recipient},</p>
-                                        <p>{reasonName} just made changes to the Dmp {name}.</p>
-
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/plans/edit/{id}" target="_blank">Click here to view it.</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/subject.en.txt
deleted file mode 100644
index cd9748bae..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/dmpmodified/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Dmp Modified
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/body.en.html
deleted file mode 100644
index bc5bfc087..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-    <style>
-      /* -------------------------------------
-          GLOBAL RESETS
-      ------------------------------------- */
-      img {
-        border: none;
-        -ms-interpolation-mode: bicubic;
-        max-width: 100%; }
-      body {
-        background-color: #f6f6f6;
-        font-family: sans-serif;
-        -webkit-font-smoothing: antialiased;
-        font-size: 14px;
-        line-height: 1.4;
-        margin: 0;
-        padding: 0;
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%; }
-      table {
-        border-collapse: separate;
-        mso-table-lspace: 0pt;
-        mso-table-rspace: 0pt;
-        width: 100%; }
-        table td {
-          font-family: sans-serif;
-          font-size: 14px;
-          vertical-align: top; }
-      /* -------------------------------------
-          BODY & CONTAINER
-      ------------------------------------- */
-      .body {
-        background-color: #f6f6f6;
-        width: 100%; }
-      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-      .container {
-        display: block;
-        Margin: 0 auto !important;
-        /* makes it centered */
-        max-width: 580px;
-        padding: 10px;
-        width: 580px; }
-      /* This should also be a block element, so that it will fill 100% of the .container */
-      .content {
-        box-sizing: border-box;
-        display: block;
-        Margin: 0 auto;
-        max-width: 580px;
-        padding: 10px; }
-      /* -------------------------------------
-          HEADER, FOOTER, MAIN
-      ------------------------------------- */
-      .main {
-        background: #ffffff;
-        border-radius: 3px;
-        width: 100%; }
-      .wrapper {
-        box-sizing: border-box;
-        padding: 20px; }
-      .content-block {
-        padding-bottom: 10px;
-        padding-top: 10px;
-      }
-      .footer {
-        clear: both;
-        Margin-top: 10px;
-        text-align: center;
-        width: 100%; }
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-          color: #999999;
-          font-size: 12px;
-          text-align: center; }
-      /* -------------------------------------
-          TYPOGRAPHY
-      ------------------------------------- */
-      h1,
-      h2,
-      h3,
-      h4 {
-        color: #000000;
-        font-family: sans-serif;
-        font-weight: 400;
-        line-height: 1.4;
-        margin: 0;
-        Margin-bottom: 30px; }
-      h1 {
-        font-size: 35px;
-        font-weight: 300;
-        text-align: center;
-        text-transform: capitalize; }
-      p,
-      ul,
-      ol {
-        font-family: sans-serif;
-        font-size: 14px;
-        font-weight: normal;
-        margin: 0;
-        Margin-bottom: 15px; }
-        p li,
-        ul li,
-        ol li {
-          list-style-position: inside;
-          margin-left: 5px; }
-      a {
-        color: #3498db;
-        text-decoration: underline; }
-      /* -------------------------------------
-          BUTTONS
-      ------------------------------------- */
-      .btn {
-        box-sizing: border-box;
-        width: 100%; }
-        .btn > tbody > tr > td {
-          padding-bottom: 15px; }
-        .btn table {
-          width: auto; }
-        .btn table td {
-          background-color: #ffffff;
-          border-radius: 5px;
-          text-align: center; }
-        .btn a {
-          background-color: #ffffff;
-          border: solid 1px #3498db;
-          border-radius: 5px;
-          box-sizing: border-box;
-          color: #3498db;
-          cursor: pointer;
-          display: inline-block;
-          font-size: 14px;
-          font-weight: bold;
-          margin: 0;
-          padding: 12px 25px;
-          text-decoration: none;
-          text-transform: capitalize; }
-      .btn-primary table td {
-        background-color: #3498db; }
-      .btn-primary a {
-        background-color: #3498db;
-        border-color: #3498db;
-        color: #ffffff; }
-      /* -------------------------------------
-          OTHER STYLES THAT MIGHT BE USEFUL
-      ------------------------------------- */
-      .last {
-        margin-bottom: 0; }
-      .first {
-        margin-top: 0; }
-      .align-center {
-        text-align: center; }
-      .align-right {
-        text-align: right; }
-      .align-left {
-        text-align: left; }
-      .clear {
-        clear: both; }
-      .mt0 {
-        margin-top: 0; }
-      .mb0 {
-        margin-bottom: 0; }
-      .preheader {
-        color: transparent;
-        display: none;
-        height: 0;
-        max-height: 0;
-        max-width: 0;
-        opacity: 0;
-        overflow: hidden;
-        mso-hide: all;
-        visibility: hidden;
-        width: 0; }
-      .powered-by a {
-        text-decoration: none; }
-      hr {
-        border: 0;
-        border-bottom: 1px solid #f6f6f6;
-        Margin: 20px 0; }
-      /* -------------------------------------
-          RESPONSIVE AND MOBILE FRIENDLY STYLES
-      ------------------------------------- */
-      @media only screen and (max-width: 620px) {
-        table[class=body] h1 {
-          font-size: 28px !important;
-          margin-bottom: 10px !important; }
-        table[class=body] p,
-        table[class=body] ul,
-        table[class=body] ol,
-        table[class=body] td,
-        table[class=body] span,
-        table[class=body] a {
-          font-size: 16px !important; }
-        table[class=body] .wrapper,
-        table[class=body] .article {
-          padding: 10px !important; }
-        table[class=body] .content {
-          padding: 0 !important; }
-        table[class=body] .container {
-          padding: 0 !important;
-          width: 100% !important; }
-        table[class=body] .main {
-          border-left-width: 0 !important;
-          border-radius: 0 !important;
-          border-right-width: 0 !important; }
-        table[class=body] .btn table {
-          width: 100% !important; }
-        table[class=body] .btn a {
-          width: 100% !important; }
-        table[class=body] .img-responsive {
-          height: auto !important;
-          max-width: 100% !important;
-          width: auto !important; }}
-      /* -------------------------------------
-          PRESERVE THESE STYLES IN THE HEAD
-      ------------------------------------- */
-      @media all {
-        .ExternalClass {
-          width: 100%; }
-        .ExternalClass,
-        .ExternalClass p,
-        .ExternalClass span,
-        .ExternalClass font,
-        .ExternalClass td,
-        .ExternalClass div {
-          line-height: 100%; }
-        .apple-link a {
-          color: inherit !important;
-          font-family: inherit !important;
-          font-size: inherit !important;
-          font-weight: inherit !important;
-          line-height: inherit !important;
-          text-decoration: none !important; }
-        .btn-primary table td:hover {
-          background-color: #34495e !important; }
-        .btn-primary a:hover {
-          background-color: #34495e !important;
-          border-color: #34495e !important; } }
-    </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td>&nbsp;</td>
-        <td class="container">
-            <div class="content">
-
-                <!-- START CENTERED WHITE CONTAINER -->
-                <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-                <table class="main">
-
-                    <!-- START MAIN CONTENT AREA -->
-                    <tr>
-                        <td class="wrapper">
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td>
-                                        <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABRCAYAAAAkVQNKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAACwgAAAsIB25LZkAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAABYBSURBVHic7Z15eJTV9cc/553JSiAhrGFNJmwWCAgpuAIBJIACokKtC0gVqYq1i8UgyjhAAWnVVkVbtIioqKgV0aJhEdCKSpEdAbMRlYTNhCUBksm85/fHTEISkslMdvvz+zzzPJn3nnvuee83dzv33DuiqvzI0QV4AjCBXwNHG9acmsFoaANqgGbAn4F9wFjgemAvMLEhjaop5EfYQgzgTmAe0LoSmbeAe4ET9WVUbeFH1ULihr7cf+Ldq598d03KwwWFrlZeRCekpOemXn7dioW9hiz7uQhSb0bWEI2+hcQNfWkwKhNAxoF26NElklefu5YV7+yn9yWt6N+nTRl5Z5HJG6v20yGqGc8v28GB1ByAw6q8J4au3P3xlM0N8iI+otES0nfY8gFquhYqklD6eY8ukax8YSwAe/Yf5z9bDzNpQk+ahAawdUc2W3ccYfLEnjQNC2Ti1NXFhJRA0I1iWJJ2bpi0tf7exndYG9qA8ug7fHk306V/Ar2JKnqa3pe0oltsJMvf2seJE+cYNqgz0391qdc8iiSoaX4Zl/Dy24ZFZu1cP+mb2rS/pmhUY0jckJemmEXmHjcZviEo0MLUW+Po1qU5Ay5t60dpepNZZO6JG/LSlGqYWmdoFISIw2HEDVn2BCJLEQLrr2ACEVkaN2TZE+JwNIq6aHAjuo5+rVnvTZ0+QPi9L/KmWQdjnvD73ps6fdB19GvNal+5f2hQQuLjlwQEnyv6N8goX/N8k57LQ/M+Iffkea9yR4/nk3uqwA9rZFTwuaJ/x8cvCfAjU62jQQkpaBr0nKBXlX4W3jSI++/sR2x0RKX5PtyQzrjJ7/LBurSLdRa4+MfyXYy5/V2OHs+vML8hwjWDowlrUrZ3FPSqgqZBz1XnXWoLDTbt7T1k2f0iPF362bCrO/HYH68kvGkQhU4Xi5fuYNmbe/Fm4lUD2/Po769gy9bDNA0L5Mm/byPraF6l8n16tmLWA5fTo2skR4/nY//zFrb893AZGVV+s2fTHc/U7A2rhwZpIXFDXxosIk+Wfz7s6s58/t8sTFPJyT1P9y6RhDcL9qrrP18eZvwdq3j2n9t50LHJKxkA1wyKJu9sIQDNI4IZMyKWpmHlWorIk3FDXxrs73vVBuqdEHE4DNR4FvSiNVDb1k1ITIjhX2tSyM93MnqYDaulaq9HcJAFX9v5z7q34JKuLXhr9UG++Cqba4fbCAq0lJNSK2o82xAzr3ovsNem6CmgvSpKUwURiOnUjNiYyseQ8jAMwTB8d1c1CQ3AFh3OoMs6eJHSXm5b6xf1Skj82CWhojqnsvTH/vwZW3dkA+7p7crVBzl12p+ZUtVY9sZejp04W/J9177j5J91VigrqnPixy4JrVUDqkC9Dup9El6epei8quQG9osi9+R5vknPxTCkyrVHy8gQAE7knPMqV6wrLDSAUcNsnD3nZM2GdK+TBkEe2bVx8p+qsrm2UK+ExCUsSwdi/MnTumUoTcMCSTt0slIZXwiJjY7gTF5hmdbhIzJ2b7zD5m+m6qLeuqzew5fH4ScZAMdOnCUv3+l1XVIVYqMjyMt3VocMgBiP7fWCeiNEisxxrVuGYrH4X+TR4/leSXG5lMpaejEZlS0SvcFiMWjTqglSZI7zO3M1UV+EhM38zcB716y4kRXPX0uXmOZ+K6iIFEOEm67rxqpl17PyhbEXzZpqQsYV8e14+59j+eCVG5g2ue/d1FNd1fUYIsBtpuoiQ6TEN+4sMnl+2U6Wvr7Hb2dhqxahHP/hLD/v25YZ0wfQPTayTPqqD1NYtPi/5OUXlsj6g04dmvHHe3/O4Ms7lnnudLq+CAiw3AZc7K+pRdQlIa2B1cDAygT2HjjBIws/JT3zlM9KrVaD+Q9fzciEyoejylwiVWHqbXHcM7kvVmuljSEfSAIWg89rUb9Ql81wAPABUGmtdLU159rhsX4pbd82jO+z8jhYbmu2NFq3bMK1w200j/DudimPlpEh/GerVxKbADcB3rcla4C6JKQDMBdYdyA154vyiV9uz+bVt/fxi3E9/FIaEmzlrlt7czqvgOVv7cNZZJZJT888xdMvfsVl/aNo09K/Nd2N13XD1imc55ft5OSpsu79gkJXHvAoEIb7n61OUB8D1R3t2oRd8tclX5F9LJ/ck+f565KvaBIawJ23xBEcXN6P5Bt+3jeKm67rxtIVe9h38AQFhS5efG03qRm5PDC1P61aVG+B3alDM6ZN7sO6zZms/yQTgNXJqXyxPWsvMBvoXy3FPqJeghyaNQ0M/+3d/Xnj3f0czznPfb+6lIBS/XREsyDatm7ik67SexihIQFMm9SHrTuymffU5/zh1/FEhJftpqJaNyG8WVCVerOPXpiJGSJMGNudzO9PkzTvE6beHkds54jLfDKwhqjXqJNBV3Tkh5xzZcgAOHm6gJM++qx6dIm86NmAS6P4LuvMRWQAZB/LJ/uY/9NegM4dmvGzbi2I7Vz9Ram/aPA99Z9QFnVJSBbuiPRaxem8Qs6eq9g7W1McPV4t10qtoi4JWQ1ciTs6vUIUOl0se2OvX0qzjuQx/o5V/OdL72uMNRvS+T7rjF+6J9y1mhX/2o/pfW22BfjYL8V+oK67rC+AfvlnCxc4nWUby/pPMxk3+V2eXbrDL4W2zuFkH8vn3qR1zPzTJxdNT7/+5gcmTV9D0rxPaN3Kv5nW2XNOFj7zJZPvX0NaZlnvsiqHgVtx/5PVWbRjvbnfb73v31tuv/Fnl+efdfLhxxklG1H+oCLfVPOIYB6aPoDD2Xl8n3WG9z5KLfkPb9OqCWFNAry67itDgNVg6u19ECAiPCjjF+N69ALqvE+rN0LiEl6+D/TZ6ub35igMDXGHUlU0ttSElAuQ6bs3Tl5cAwU+o/7c7zjfo5r+n6q8tqEhVkJDKp7BV+W69wHqsb1eUG+E7Np41/fANl9kSwcstGsTVm0XejGKSWnXJgyAnt1bsnjhcIZe1cmX7Ns8ttcL6nUdIqpPeUuPjAjmsQevYN3KiSWVlXU0r0ZkFOPo8XyyjuYxfnRXVjx/HVcP7MBf5w7FMeNKxEvASlU21zbqlZDdm6e8AXxVUVpoiJXHHrySG67tRqsWIfx17lBuGtO91m0YPczG+2tTOXWmgG27jtCmVSgtmodUJv6Vx+Z6Q70SooqKoTMqSgsNCeCy+CjeT07lQGoO769NY5hvXYpfCA2xMjaxC59++T3dbJFcEd++UlkxdIZq3ex7VIZ6d53s2jDlY+CjitKCg6yMSexC+qGTjBkRS1CQb55gp9Ok/DqnMhTHYLWICKFZU69HUT7y2FqvaBhfllXvQymzw3TufBGHs91xuQEBbrN8reSYTuFEd/LtaMdvH93I6+/ux1Q4eeo8c5/8nJzcckcblBysep9PCmsZDRb93mvI8gRDdG3pGN+QYCv339mPFpEh5OSe47llOzmTV1ipjratm/C7u/szapgNU5XlK/exeOkOCgpdVZbfrk0YZ/ILK9AvRabKiL2bJm2s9svVAA16Crd3wrJfCzxf/rnValBUVHnrCA6yMuWXvfjVzb0v6tbSM0/xyMJP2XugencGKNyzZ+Mdf69W5lpAgx+L7jPkpb+pyG98lQ8MsLDkLyPoF9emUhnTVJa+vofnlu30Smx5iOrTuzZNecDnDHWABt8P2bVpygOq+jA+ruJjOoWTe+o87/z7m0q9sidPF+AsMr1NZ8tDVfXhhiYDGgEhAHs2TVmA6HgQ76dtcB9XGHZ1Z4Ze2YnFS3dw6LsLIUSq8O6aFDZ8+i3TJvWheXjVW7cgeYiO37NpyoKavENtoVEQArD74ynvYeoVCim+yDePCOb+O/vxTXour72zn30HT7Bo8VYG9o9iwphuGN6W3x4opGDqFbs/nlJvvqqq0GgIAdi9+Y49QWcKe4JMRznmS54Rg6MZNSyGdZszeWj6gBJ/lVcox0CmB50p7Ll78x17amp3baLRXa2xbdvdTmBxr4TnXhZC/yDwB6CptzyREcF0bO9VpBhnFJ5QOfvE3o33Vtk9NgQaHSHF8FSYo1fCc09YCBmpyPXAaMDfSO2TKGuAVaac/bCxElGMRktIMTwV+DbwdkKCw9okrO3Yo8fzn2nTqkm70nKBAdZ83KGeJbg8vv096TuO/NPT6n4cUNUf48eiqg+qar5ewJJSfx9T1amqajQCW/36NKpB3Q+4gL8AvYB1pZ47gaeArsAL1EEYUl2jwVfqtYRJuM+ifAEcbGBbaoT/FUL+Z/Bj7bL+Z/ETIY0MPxHSyFDhOiQ+fklAbm52H1wMQOgMstNwGVtTvn2kTg881jYSF2Y9hl44bKqCAvkIOaJkmgbb182I2l9Z/olvYTmZlj1W0MCgAnl/tT3Ka+TiqEVZ3dXkekXWJydFlQRzjHz8yERTNUHUfaunijhFNQ9Ds8Qln330cNT2Ytkyg7rIWxZb9NezgJlARQf0vjORqRkZs5N9qI8GR+LC7ANAVaEr+0SY38wW9ebKCZTZakxcmH038A/P1+XJSVGTK1MyfP6xNlbDtVehJXDepWaH9TPb/5D4ePYgFO93Bau8QYA8kPxgm2MlXVZs7LyutuivPwMcuMkwcUeufyjuowUAHQ30o1ibY3HHjk/5vNnQyNFTlddOpWdvG77gcItyaSNL/T1p5PzsfpUpsRiuOR4yAIIN5EoAVSl9LcdRYBfuev2u5KnozRSZB0bMP9zXAOjRY1FTTNd63EeYnSBJIU0IT8uw90rLsI9OzbC3x6AzsAoA5d5A6+l6iXWtLQiMWpsUZVgKgsIpMmyK3gLyfomA0tdiGOuvW/htaV9ZmTFWDaZVpDvBcTwMuKVseVLB+Kx/T06K6pucFNUrOSmqU5HL1QFY60lsLoZljgHgLDj3ONAJyDGUy9IyZj++d6+9jBMuLc3+bVqGfTzIbz2PpthsjhFVV0XjgYKusUeeTn6kTcbapHavJye1HYsaY4DzHoG+RQTYK84KwC3jFp24yK0cEFR0M+7TuX4t6jbM6nDYFKaWKmagERPjuAz3724AMj3lkH17hbk9SMuY/TeBlQCiLGnoWzxriuSZbT4Q5e7i7wpTRy84Uv6i/yyQVCDsnDpvKZeGqLtSlSrGigpQdL7gdOnvVlFG4/71gHVpGbNf90WJJZD7igoZA3Q+dSK7N7A9JmbuQANzhqH8KTXTvsMWPedm0EGATZVdFmFNSoZ9U0X6bDbHAFFuBOJRcsSQrU5X4IuZmUm55WVFHEZMZ5lioINViAUyVdhisUS+kJJyf7VuO7u8MOq1LYHZdtz6QotExwEvlggoIWLwmiozBEoP9Iya/30chsV9bl31Q0SG+FN2UHDwzFITq88MMSgeqHyO0jt40H4C2A3g8uQXzN8BN6gw3xbt2AC6AnfLGyHCH03Y2CXa8UyvXo6ScEERxBbtmCPKFmAGMBThJlVdZJWC3TabY1DpcmNiHG1tMWwV0RdVuB24AvilKM+4inK+jo6e5/f1TwB2O6Ya8knxd0OkaxkBIdilpjvGV+k3YlF2fHGSy7B6uhzZjRgZ3kuSASMWZt+V+HjW/YkLshckLszeo1oSWluoKn8z0OIKZaef77ETQLSE0GC3vSQCgwWSVZigQiLKqwAqTD+Xz6xiBbbOjntEeBQoAl4X5GZPRa9B6CDK6ujo+VHgnpIb8CZacnB/u4jMEOVFlCIBmyGud6rbhRqqJUcOFC1/YVnwuqR2OxS+BhAXdwFMdHwdKKK3eWReNVSrustjlMALqDyNkITbWw2Qh+jktTPbbq6TDSoRFqam22eVerQ2NsaRhbsVPBQdPW+Zy+U6FWilONLjb2kZ9odKyb8aG+PYDAyy4FwE3B7b+evBCoMAVLg/Pd1echqrS/ScNYr+S+DSnJwjI4H38ROmSAfxdB2qlL+azvC81ysoCxDGOxzcezIwcrioRgBmkatohcVivUa8j+umR9d5kO/B/FYw1rgk6MV1DzU/BWBF2I5yrUJfKgmCrgR9AVQoPwk46VL+XF64sKjZY4HW0/cATa1ijrAEchiTZoALlU88k4sSiMpqER2EZy2gwjWepGMWS+QLpWXTMmevskU7DgA9RPV6qkEIqiW3FhlwqEKZIn0Ni8wHWm8Jzr5K4AZP/X+8YVaHwyMWHqmqkLnhse3mll+AloahZkmFDvXV9ks6LGgBxAFYzLKECKzNyLBfdKDvu+9+dw5PN2ei/USl+EYdC6IfGPB56Y+I/sWjsGVsrKMTEOLRv6n84K2Kqmc+r+W2cX3BuEUnmgqUvgVnV0VyybPafYewyV2mTBBlHICIvOJrWd7IALCqsEbgEeAam80xMT3dvrIqpYUBhc/grqBvw1tGlQmjUe8RIs0ARHCqUjzdK1TwOrsrHWFlVjLXl2qeX0xwYA0Mcj7HhUXgkRORUasrtcXUV1QkQdBpCgHA2YLzln9Vp+yKYM3IsH8RG+NYAkwT5VmbzXEgPd2+u7IMsTGOXwO/BBCYVkEAQWLXznN7pmQ+WubCgO6dHTaEnghgsl0NSfH02YEBJnMOZtrTvRkaG+Oozvt5RYLjUHBgUNAbQKk7FeXJbXdTaVBEkCXw7fOmczGeFgu8u9HeqtYiWawAhpUZppNrPTOb/3axzXkkOFSfL71aj411dMLkKeAGAFFeST1kr2jMMVyG+ZeYGMcvi7uu2NjHw8Vgqae8My4CPgwLdf5wLp+DQHenweL27R03Hj5sL/GmxsQ4LjOEZwV5LzV99tzi5yJUHAknhHlrIwr9ExcctYpod0V7C8QFBgVdQlkn6vLkpLYXjX+l8d6MlmcSFxx5D9GbAUzB5+7KF1gBUlLsp7t2diS6hFcFLlXVRefyWRgb49gPfCvQBygddrM0OIxKA5MFRgpkx9oc76CcRhmjgueGSnn00KGHswG6RM+5R0U3CIwMDiSnS4xjkyKfI9rVgPEooaZcWIQBiFZMiCphVQSPzkPMEs7KcXcWeOqHyCifmqHCKwI3A9nNbVHrfcnjK0qmvSmZ9q/j45cMzP0h24HyRwQr0BPoWcr4owYyLSVjtrdY2DUoOQi3odwKFA8CharycEbm7JKfqEg9NHtjl2jHcBVeAjq51zCa6Kmt88Cc9PTZL3hUZCmgFzzPZVDskZZK0itAkcIOUTaIBjz90cMtK7haQne6f66v7H0tEV3aJp9MOzJbRDeXGaQN3euJc3FZrJY9ACrylWePQ1Cpcq1XYZBDx45PhVitp/uIEC9KRxX2qLLt0CG+UbVXGFpji3GsEhin8GZ6hv3mrjGOISYyWNEYA7arwUdpafYK7whp394RGhREvKH0RTiJwfaOHTmwcaO9qLRMcICMF6uuS021XxT3GxPjiBDhOlU+KO4qR8w/PEzEuDDJMKQAU3LU6swRCchKfrCN1/PWCQ6sAYFHrjRx7V0/s/0P3mSLMfLxw33UNAqSZ0YdKH6WOP9oL9NiRqx/KOozrWLyUWtRJ+UJqRWl/w/x0556I0OtESKeKEH5EUYLNibUIiHypkBW8V7JT6ge/g9Vp5cnaQHCkAAAAABJRU5ErkJggg==" alt="OpenDMP" width="100" height="81">
-                                        <h2>User {userName} have sent you a merge Request.</h2>
-                                        <p>Please confirm that you want to merge your {installation-url} account with that account.
-                                            <br/>The link will expire in {expiration_time}.</p>
-                                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                                            <tbody>
-                                            <tr>
-                                                <td align="left">
-                                                    <table border="0" cellpadding="0" cellspacing="0">
-                                                        <tbody>
-                                                        <tr>
-                                                            <td> <a href="{installation-url}/merge/confirmation/{confirmationToken}" target="_blank">Confirm Merge Request</a> </td>
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            </tbody>
-                                        </table>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    <!-- END MAIN CONTENT AREA -->
-                </table>
-
-                <!-- START FOOTER -->
-                <div class="footer">
-
-                </div>
-                <!-- END FOOTER -->
-
-                <!-- END CENTERED WHITE CONTAINER -->
-            </div>
-        </td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/subject.en.txt
deleted file mode 100644
index 3c52e9249..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/mergeacountconfirmation/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Merge Account Confirmation
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/body.en.html
deleted file mode 100644
index b7607774e..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/body.en.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Simple Transactional Email</title>
-</head>
-<body class="">
-{description}
-<br/>
-<br/>
-Send by user: {email}
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/subject.en.txt
deleted file mode 100644
index 052f2db8c..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/publiccontactsupport/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - {subject}
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/body.en.html b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/body.en.html
deleted file mode 100644
index a43224531..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/body.en.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta name="viewport" content="width=device-width" />
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title>Simple Transactional Email</title>
-  <style>
-    /* -------------------------------------
-        GLOBAL RESETS
-    ------------------------------------- */
-    img {
-      border: none;
-      -ms-interpolation-mode: bicubic;
-      max-width: 100%; }
-    body {
-      background-color: #f6f6f6;
-      font-family: sans-serif;
-      -webkit-font-smoothing: antialiased;
-      font-size: 14px;
-      line-height: 1.4;
-      margin: 0;
-      padding: 0;
-      -ms-text-size-adjust: 100%;
-      -webkit-text-size-adjust: 100%; }
-    table {
-      border-collapse: separate;
-      mso-table-lspace: 0pt;
-      mso-table-rspace: 0pt;
-      width: 100%; }
-    table td {
-      font-family: sans-serif;
-      font-size: 14px;
-      vertical-align: top; }
-    /* -------------------------------------
-        BODY & CONTAINER
-    ------------------------------------- */
-    .body {
-      background-color: #f6f6f6;
-      width: 100%; }
-    /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
-    .container {
-      display: block;
-      Margin: 0 auto !important;
-      /* makes it centered */
-      max-width: 580px;
-      padding: 10px;
-      width: 580px; }
-    /* This should also be a block element, so that it will fill 100% of the .container */
-    .content {
-      box-sizing: border-box;
-      display: block;
-      Margin: 0 auto;
-      max-width: 580px;
-      padding: 10px; }
-    /* -------------------------------------
-        HEADER, FOOTER, MAIN
-    ------------------------------------- */
-    .main {
-      background: #ffffff;
-      border-radius: 3px;
-      width: 100%; }
-    .wrapper {
-      box-sizing: border-box;
-      padding: 20px; }
-    .content-block {
-      padding-bottom: 10px;
-      padding-top: 10px;
-    }
-    .footer {
-      clear: both;
-      Margin-top: 10px;
-      text-align: center;
-      width: 100%; }
-    .footer td,
-    .footer p,
-    .footer span,
-    .footer a {
-      color: #999999;
-      font-size: 12px;
-      text-align: center; }
-    /* -------------------------------------
-        TYPOGRAPHY
-    ------------------------------------- */
-    h1,
-    h2,
-    h3,
-    h4 {
-      color: #000000;
-      font-family: sans-serif;
-      font-weight: 400;
-      line-height: 1.4;
-      margin: 0;
-      Margin-bottom: 30px; }
-    h1 {
-      font-size: 35px;
-      font-weight: 300;
-      text-align: center;
-      text-transform: capitalize; }
-    p,
-    ul,
-    ol {
-      font-family: sans-serif;
-      font-size: 14px;
-      font-weight: normal;
-      margin: 0;
-      Margin-bottom: 15px; }
-    p li,
-    ul li,
-    ol li {
-      list-style-position: inside;
-      margin-left: 5px; }
-    a {
-      color: #3498db;
-      text-decoration: underline; }
-    /* -------------------------------------
-        BUTTONS
-    ------------------------------------- */
-    .btn {
-      box-sizing: border-box;
-      width: 100%; }
-    .btn > tbody > tr > td {
-      padding-bottom: 15px; }
-    .btn table {
-      width: auto; }
-    .btn table td {
-      background-color: #ffffff;
-      border-radius: 5px;
-      text-align: center; }
-    .btn a {
-      background-color: #ffffff;
-      border: solid 1px #3498db;
-      border-radius: 5px;
-      box-sizing: border-box;
-      color: #3498db;
-      cursor: pointer;
-      display: inline-block;
-      font-size: 14px;
-      font-weight: bold;
-      margin: 0;
-      padding: 12px 25px;
-      text-decoration: none;
-      text-transform: capitalize; }
-    .btn-primary table td {
-      background-color: #3498db; }
-    .btn-primary a {
-      background-color: #3498db;
-      border-color: #3498db;
-      color: #ffffff; }
-    /* -------------------------------------
-        OTHER STYLES THAT MIGHT BE USEFUL
-    ------------------------------------- */
-    .last {
-      margin-bottom: 0; }
-    .first {
-      margin-top: 0; }
-    .align-center {
-      text-align: center; }
-    .align-right {
-      text-align: right; }
-    .align-left {
-      text-align: left; }
-    .clear {
-      clear: both; }
-    .mt0 {
-      margin-top: 0; }
-    .mb0 {
-      margin-bottom: 0; }
-    .preheader {
-      color: transparent;
-      display: none;
-      height: 0;
-      max-height: 0;
-      max-width: 0;
-      opacity: 0;
-      overflow: hidden;
-      mso-hide: all;
-      visibility: hidden;
-      width: 0; }
-    .powered-by a {
-      text-decoration: none; }
-    hr {
-      border: 0;
-      border-bottom: 1px solid #f6f6f6;
-      Margin: 20px 0; }
-    /* -------------------------------------
-        RESPONSIVE AND MOBILE FRIENDLY STYLES
-    ------------------------------------- */
-    @media only screen and (max-width: 620px) {
-      table[class=body] h1 {
-        font-size: 28px !important;
-        margin-bottom: 10px !important; }
-      table[class=body] p,
-      table[class=body] ul,
-      table[class=body] ol,
-      table[class=body] td,
-      table[class=body] span,
-      table[class=body] a {
-        font-size: 16px !important; }
-      table[class=body] .wrapper,
-      table[class=body] .article {
-        padding: 10px !important; }
-      table[class=body] .content {
-        padding: 0 !important; }
-      table[class=body] .container {
-        padding: 0 !important;
-        width: 100% !important; }
-      table[class=body] .main {
-        border-left-width: 0 !important;
-        border-radius: 0 !important;
-        border-right-width: 0 !important; }
-      table[class=body] .btn table {
-        width: 100% !important; }
-      table[class=body] .btn a {
-        width: 100% !important; }
-      table[class=body] .img-responsive {
-        height: auto !important;
-        max-width: 100% !important;
-        width: auto !important; }}
-    /* -------------------------------------
-        PRESERVE THESE STYLES IN THE HEAD
-    ------------------------------------- */
-    @media all {
-      .ExternalClass {
-        width: 100%; }
-      .ExternalClass,
-      .ExternalClass p,
-      .ExternalClass span,
-      .ExternalClass font,
-      .ExternalClass td,
-      .ExternalClass div {
-        line-height: 100%; }
-      .apple-link a {
-        color: inherit !important;
-        font-family: inherit !important;
-        font-size: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-        text-decoration: none !important; }
-      .btn-primary table td:hover {
-        background-color: #34495e !important; }
-      .btn-primary a:hover {
-        background-color: #34495e !important;
-        border-color: #34495e !important; } }
-  </style>
-</head>
-<body class="">
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-  <tr>
-    <td>&nbsp;</td>
-    <td class="container">
-      <div class="content">
-
-        <!-- START CENTERED WHITE CONTAINER -->
-        <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
-        <table class="main">
-
-          <!-- START MAIN CONTENT AREA -->
-          <tr>
-            <td class="wrapper">
-              <table border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td>
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABRCAYAAAAkVQNKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAACwgAAAsIB25LZkAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAABYBSURBVHic7Z15eJTV9cc/553JSiAhrGFNJmwWCAgpuAIBJIACokKtC0gVqYq1i8UgyjhAAWnVVkVbtIioqKgV0aJhEdCKSpEdAbMRlYTNhCUBksm85/fHTEISkslMdvvz+zzzPJn3nnvuee83dzv33DuiqvzI0QV4AjCBXwNHG9acmsFoaANqgGbAn4F9wFjgemAvMLEhjaop5EfYQgzgTmAe0LoSmbeAe4ET9WVUbeFH1ULihr7cf+Ldq598d03KwwWFrlZeRCekpOemXn7dioW9hiz7uQhSb0bWEI2+hcQNfWkwKhNAxoF26NElklefu5YV7+yn9yWt6N+nTRl5Z5HJG6v20yGqGc8v28GB1ByAw6q8J4au3P3xlM0N8iI+otES0nfY8gFquhYqklD6eY8ukax8YSwAe/Yf5z9bDzNpQk+ahAawdUc2W3ccYfLEnjQNC2Ti1NXFhJRA0I1iWJJ2bpi0tf7exndYG9qA8ug7fHk306V/Ar2JKnqa3pe0oltsJMvf2seJE+cYNqgz0391qdc8iiSoaX4Zl/Dy24ZFZu1cP+mb2rS/pmhUY0jckJemmEXmHjcZviEo0MLUW+Po1qU5Ay5t60dpepNZZO6JG/LSlGqYWmdoFISIw2HEDVn2BCJLEQLrr2ACEVkaN2TZE+JwNIq6aHAjuo5+rVnvTZ0+QPi9L/KmWQdjnvD73ps6fdB19GvNal+5f2hQQuLjlwQEnyv6N8goX/N8k57LQ/M+Iffkea9yR4/nk3uqwA9rZFTwuaJ/x8cvCfAjU62jQQkpaBr0nKBXlX4W3jSI++/sR2x0RKX5PtyQzrjJ7/LBurSLdRa4+MfyXYy5/V2OHs+vML8hwjWDowlrUrZ3FPSqgqZBz1XnXWoLDTbt7T1k2f0iPF362bCrO/HYH68kvGkQhU4Xi5fuYNmbe/Fm4lUD2/Po769gy9bDNA0L5Mm/byPraF6l8n16tmLWA5fTo2skR4/nY//zFrb893AZGVV+s2fTHc/U7A2rhwZpIXFDXxosIk+Wfz7s6s58/t8sTFPJyT1P9y6RhDcL9qrrP18eZvwdq3j2n9t50LHJKxkA1wyKJu9sIQDNI4IZMyKWpmHlWorIk3FDXxrs73vVBuqdEHE4DNR4FvSiNVDb1k1ITIjhX2tSyM93MnqYDaulaq9HcJAFX9v5z7q34JKuLXhr9UG++Cqba4fbCAq0lJNSK2o82xAzr3ovsNem6CmgvSpKUwURiOnUjNiYyseQ8jAMwTB8d1c1CQ3AFh3OoMs6eJHSXm5b6xf1Skj82CWhojqnsvTH/vwZW3dkA+7p7crVBzl12p+ZUtVY9sZejp04W/J9177j5J91VigrqnPixy4JrVUDqkC9Dup9El6epei8quQG9osi9+R5vknPxTCkyrVHy8gQAE7knPMqV6wrLDSAUcNsnD3nZM2GdK+TBkEe2bVx8p+qsrm2UK+ExCUsSwdi/MnTumUoTcMCSTt0slIZXwiJjY7gTF5hmdbhIzJ2b7zD5m+m6qLeuqzew5fH4ScZAMdOnCUv3+l1XVIVYqMjyMt3VocMgBiP7fWCeiNEisxxrVuGYrH4X+TR4/leSXG5lMpaejEZlS0SvcFiMWjTqglSZI7zO3M1UV+EhM38zcB716y4kRXPX0uXmOZ+K6iIFEOEm67rxqpl17PyhbEXzZpqQsYV8e14+59j+eCVG5g2ue/d1FNd1fUYIsBtpuoiQ6TEN+4sMnl+2U6Wvr7Hb2dhqxahHP/hLD/v25YZ0wfQPTayTPqqD1NYtPi/5OUXlsj6g04dmvHHe3/O4Ms7lnnudLq+CAiw3AZc7K+pRdQlIa2B1cDAygT2HjjBIws/JT3zlM9KrVaD+Q9fzciEyoejylwiVWHqbXHcM7kvVmuljSEfSAIWg89rUb9Ql81wAPABUGmtdLU159rhsX4pbd82jO+z8jhYbmu2NFq3bMK1w200j/DudimPlpEh/GerVxKbADcB3rcla4C6JKQDMBdYdyA154vyiV9uz+bVt/fxi3E9/FIaEmzlrlt7czqvgOVv7cNZZJZJT888xdMvfsVl/aNo09K/Nd2N13XD1imc55ft5OSpsu79gkJXHvAoEIb7n61OUB8D1R3t2oRd8tclX5F9LJ/ck+f565KvaBIawJ23xBEcXN6P5Bt+3jeKm67rxtIVe9h38AQFhS5efG03qRm5PDC1P61aVG+B3alDM6ZN7sO6zZms/yQTgNXJqXyxPWsvMBvoXy3FPqJeghyaNQ0M/+3d/Xnj3f0czznPfb+6lIBS/XREsyDatm7ik67SexihIQFMm9SHrTuymffU5/zh1/FEhJftpqJaNyG8WVCVerOPXpiJGSJMGNudzO9PkzTvE6beHkds54jLfDKwhqjXqJNBV3Tkh5xzZcgAOHm6gJM++qx6dIm86NmAS6P4LuvMRWQAZB/LJ/uY/9NegM4dmvGzbi2I7Vz9Ram/aPA99Z9QFnVJSBbuiPRaxem8Qs6eq9g7W1McPV4t10qtoi4JWQ1ciTs6vUIUOl0se2OvX0qzjuQx/o5V/OdL72uMNRvS+T7rjF+6J9y1mhX/2o/pfW22BfjYL8V+oK67rC+AfvlnCxc4nWUby/pPMxk3+V2eXbrDL4W2zuFkH8vn3qR1zPzTJxdNT7/+5gcmTV9D0rxPaN3Kv5nW2XNOFj7zJZPvX0NaZlnvsiqHgVtx/5PVWbRjvbnfb73v31tuv/Fnl+efdfLhxxklG1H+oCLfVPOIYB6aPoDD2Xl8n3WG9z5KLfkPb9OqCWFNAry67itDgNVg6u19ECAiPCjjF+N69ALqvE+rN0LiEl6+D/TZ6ub35igMDXGHUlU0ttSElAuQ6bs3Tl5cAwU+o/7c7zjfo5r+n6q8tqEhVkJDKp7BV+W69wHqsb1eUG+E7Np41/fANl9kSwcstGsTVm0XejGKSWnXJgyAnt1bsnjhcIZe1cmX7Ns8ttcL6nUdIqpPeUuPjAjmsQevYN3KiSWVlXU0r0ZkFOPo8XyyjuYxfnRXVjx/HVcP7MBf5w7FMeNKxEvASlU21zbqlZDdm6e8AXxVUVpoiJXHHrySG67tRqsWIfx17lBuGtO91m0YPczG+2tTOXWmgG27jtCmVSgtmodUJv6Vx+Z6Q70SooqKoTMqSgsNCeCy+CjeT07lQGoO769NY5hvXYpfCA2xMjaxC59++T3dbJFcEd++UlkxdIZq3ex7VIZ6d53s2jDlY+CjitKCg6yMSexC+qGTjBkRS1CQb55gp9Ok/DqnMhTHYLWICKFZU69HUT7y2FqvaBhfllXvQymzw3TufBGHs91xuQEBbrN8reSYTuFEd/LtaMdvH93I6+/ux1Q4eeo8c5/8nJzcckcblBysep9PCmsZDRb93mvI8gRDdG3pGN+QYCv339mPFpEh5OSe47llOzmTV1ipjratm/C7u/szapgNU5XlK/exeOkOCgpdVZbfrk0YZ/ILK9AvRabKiL2bJm2s9svVAA16Crd3wrJfCzxf/rnValBUVHnrCA6yMuWXvfjVzb0v6tbSM0/xyMJP2XugencGKNyzZ+Mdf69W5lpAgx+L7jPkpb+pyG98lQ8MsLDkLyPoF9emUhnTVJa+vofnlu30Smx5iOrTuzZNecDnDHWABt8P2bVpygOq+jA+ruJjOoWTe+o87/z7m0q9sidPF+AsMr1NZ8tDVfXhhiYDGgEhAHs2TVmA6HgQ76dtcB9XGHZ1Z4Ze2YnFS3dw6LsLIUSq8O6aFDZ8+i3TJvWheXjVW7cgeYiO37NpyoKavENtoVEQArD74ynvYeoVCim+yDePCOb+O/vxTXour72zn30HT7Bo8VYG9o9iwphuGN6W3x4opGDqFbs/nlJvvqqq0GgIAdi9+Y49QWcKe4JMRznmS54Rg6MZNSyGdZszeWj6gBJ/lVcox0CmB50p7Ll78x17amp3baLRXa2xbdvdTmBxr4TnXhZC/yDwB6CptzyREcF0bO9VpBhnFJ5QOfvE3o33Vtk9NgQaHSHF8FSYo1fCc09YCBmpyPXAaMDfSO2TKGuAVaac/bCxElGMRktIMTwV+DbwdkKCw9okrO3Yo8fzn2nTqkm70nKBAdZ83KGeJbg8vv096TuO/NPT6n4cUNUf48eiqg+qar5ewJJSfx9T1amqajQCW/36NKpB3Q+4gL8AvYB1pZ47gaeArsAL1EEYUl2jwVfqtYRJuM+ifAEcbGBbaoT/FUL+Z/Bj7bL+Z/ETIY0MPxHSyFDhOiQ+fklAbm52H1wMQOgMstNwGVtTvn2kTg881jYSF2Y9hl44bKqCAvkIOaJkmgbb182I2l9Z/olvYTmZlj1W0MCgAnl/tT3Ka+TiqEVZ3dXkekXWJydFlQRzjHz8yERTNUHUfaunijhFNQ9Ds8Qln330cNT2Ytkyg7rIWxZb9NezgJlARQf0vjORqRkZs5N9qI8GR+LC7ANAVaEr+0SY38wW9ebKCZTZakxcmH038A/P1+XJSVGTK1MyfP6xNlbDtVehJXDepWaH9TPb/5D4ePYgFO93Bau8QYA8kPxgm2MlXVZs7LyutuivPwMcuMkwcUeufyjuowUAHQ30o1ibY3HHjk/5vNnQyNFTlddOpWdvG77gcItyaSNL/T1p5PzsfpUpsRiuOR4yAIIN5EoAVSl9LcdRYBfuev2u5KnozRSZB0bMP9zXAOjRY1FTTNd63EeYnSBJIU0IT8uw90rLsI9OzbC3x6AzsAoA5d5A6+l6iXWtLQiMWpsUZVgKgsIpMmyK3gLyfomA0tdiGOuvW/htaV9ZmTFWDaZVpDvBcTwMuKVseVLB+Kx/T06K6pucFNUrOSmqU5HL1QFY60lsLoZljgHgLDj3ONAJyDGUy9IyZj++d6+9jBMuLc3+bVqGfTzIbz2PpthsjhFVV0XjgYKusUeeTn6kTcbapHavJye1HYsaY4DzHoG+RQTYK84KwC3jFp24yK0cEFR0M+7TuX4t6jbM6nDYFKaWKmagERPjuAz3724AMj3lkH17hbk9SMuY/TeBlQCiLGnoWzxriuSZbT4Q5e7i7wpTRy84Uv6i/yyQVCDsnDpvKZeGqLtSlSrGigpQdL7gdOnvVlFG4/71gHVpGbNf90WJJZD7igoZA3Q+dSK7N7A9JmbuQANzhqH8KTXTvsMWPedm0EGATZVdFmFNSoZ9U0X6bDbHAFFuBOJRcsSQrU5X4IuZmUm55WVFHEZMZ5lioINViAUyVdhisUS+kJJyf7VuO7u8MOq1LYHZdtz6QotExwEvlggoIWLwmiozBEoP9Iya/30chsV9bl31Q0SG+FN2UHDwzFITq88MMSgeqHyO0jt40H4C2A3g8uQXzN8BN6gw3xbt2AC6AnfLGyHCH03Y2CXa8UyvXo6ScEERxBbtmCPKFmAGMBThJlVdZJWC3TabY1DpcmNiHG1tMWwV0RdVuB24AvilKM+4inK+jo6e5/f1TwB2O6Ya8knxd0OkaxkBIdilpjvGV+k3YlF2fHGSy7B6uhzZjRgZ3kuSASMWZt+V+HjW/YkLshckLszeo1oSWluoKn8z0OIKZaef77ETQLSE0GC3vSQCgwWSVZigQiLKqwAqTD+Xz6xiBbbOjntEeBQoAl4X5GZPRa9B6CDK6ujo+VHgnpIb8CZacnB/u4jMEOVFlCIBmyGud6rbhRqqJUcOFC1/YVnwuqR2OxS+BhAXdwFMdHwdKKK3eWReNVSrustjlMALqDyNkITbWw2Qh+jktTPbbq6TDSoRFqam22eVerQ2NsaRhbsVPBQdPW+Zy+U6FWilONLjb2kZ9odKyb8aG+PYDAyy4FwE3B7b+evBCoMAVLg/Pd1echqrS/ScNYr+S+DSnJwjI4H38ROmSAfxdB2qlL+azvC81ysoCxDGOxzcezIwcrioRgBmkatohcVivUa8j+umR9d5kO/B/FYw1rgk6MV1DzU/BWBF2I5yrUJfKgmCrgR9AVQoPwk46VL+XF64sKjZY4HW0/cATa1ijrAEchiTZoALlU88k4sSiMpqER2EZy2gwjWepGMWS+QLpWXTMmevskU7DgA9RPV6qkEIqiW3FhlwqEKZIn0Ni8wHWm8Jzr5K4AZP/X+8YVaHwyMWHqmqkLnhse3mll+AloahZkmFDvXV9ks6LGgBxAFYzLKECKzNyLBfdKDvu+9+dw5PN2ei/USl+EYdC6IfGPB56Y+I/sWjsGVsrKMTEOLRv6n84K2Kqmc+r+W2cX3BuEUnmgqUvgVnV0VyybPafYewyV2mTBBlHICIvOJrWd7IALCqsEbgEeAam80xMT3dvrIqpYUBhc/grqBvw1tGlQmjUe8RIs0ARHCqUjzdK1TwOrsrHWFlVjLXl2qeX0xwYA0Mcj7HhUXgkRORUasrtcXUV1QkQdBpCgHA2YLzln9Vp+yKYM3IsH8RG+NYAkwT5VmbzXEgPd2+u7IMsTGOXwO/BBCYVkEAQWLXznN7pmQ+WubCgO6dHTaEnghgsl0NSfH02YEBJnMOZtrTvRkaG+Oozvt5RYLjUHBgUNAbQKk7FeXJbXdTaVBEkCXw7fOmczGeFgu8u9HeqtYiWawAhpUZppNrPTOb/3axzXkkOFSfL71aj411dMLkKeAGAFFeST1kr2jMMVyG+ZeYGMcvi7uu2NjHw8Vgqae8My4CPgwLdf5wLp+DQHenweL27R03Hj5sL/GmxsQ4LjOEZwV5LzV99tzi5yJUHAknhHlrIwr9ExcctYpod0V7C8QFBgVdQlkn6vLkpLYXjX+l8d6MlmcSFxx5D9GbAUzB5+7KF1gBUlLsp7t2diS6hFcFLlXVRefyWRgb49gPfCvQBygddrM0OIxKA5MFRgpkx9oc76CcRhmjgueGSnn00KGHswG6RM+5R0U3CIwMDiSnS4xjkyKfI9rVgPEooaZcWIQBiFZMiCphVQSPzkPMEs7KcXcWeOqHyCifmqHCKwI3A9nNbVHrfcnjK0qmvSmZ9q/j45cMzP0h24HyRwQr0BPoWcr4owYyLSVjtrdY2DUoOQi3odwKFA8CharycEbm7JKfqEg9NHtjl2jHcBVeAjq51zCa6Kmt88Cc9PTZL3hUZCmgFzzPZVDskZZK0itAkcIOUTaIBjz90cMtK7haQne6f66v7H0tEV3aJp9MOzJbRDeXGaQN3euJc3FZrJY9ACrylWePQ1Cpcq1XYZBDx45PhVitp/uIEC9KRxX2qLLt0CG+UbVXGFpji3GsEhin8GZ6hv3mrjGOISYyWNEYA7arwUdpafYK7whp394RGhREvKH0RTiJwfaOHTmwcaO9qLRMcICMF6uuS021XxT3GxPjiBDhOlU+KO4qR8w/PEzEuDDJMKQAU3LU6swRCchKfrCN1/PWCQ6sAYFHrjRx7V0/s/0P3mSLMfLxw33UNAqSZ0YdKH6WOP9oL9NiRqx/KOozrWLyUWtRJ+UJqRWl/w/x0556I0OtESKeKEH5EUYLNibUIiHypkBW8V7JT6ge/g9Vp5cnaQHCkAAAAABJRU5ErkJggg==" alt="OpenDMP" width="100" height="81">
-                    <h2>You have made a request to unlink your email account in ARGOS.</h2>
-                    <p>Please confirm that you want to unlink your {email} account.
-                      <br/>The link will expire in {expiration_time}.</p>
-                    <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
-                      <tbody>
-                      <tr>
-                        <td align="left">
-                          <table border="0" cellpadding="0" cellspacing="0">
-                            <tbody>
-                            <tr>
-                              <td> <a href="{installation-url}/unlink/confirmation/{confirmationToken}" target="_blank">Confirm Unlink Request</a> </td>
-                            </tr>
-                            </tbody>
-                          </table>
-                        </td>
-                      </tr>
-                      </tbody>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-
-          <!-- END MAIN CONTENT AREA -->
-        </table>
-
-        <!-- START FOOTER -->
-        <div class="footer">
-
-        </div>
-        <!-- END FOOTER -->
-
-        <!-- END CENTERED WHITE CONTAINER -->
-      </div>
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/subject.en.txt b/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/subject.en.txt
deleted file mode 100644
index e957d468f..000000000
--- a/dmp-backend/notification-service/notification-web/target/classes/notification_templates/removecredentialconfirmation/email/subject.en.txt
+++ /dev/null
@@ -1 +0,0 @@
-ARGOS - Unlink Email Confirmation
\ No newline at end of file
diff --git a/dmp-backend/notification-service/Dockerfile b/notification-service/Dockerfile
similarity index 100%
rename from dmp-backend/notification-service/Dockerfile
rename to notification-service/Dockerfile
diff --git a/dmp-backend/notification-service/notification-web/.gitignore b/notification-service/notification-web/.gitignore
similarity index 100%
rename from dmp-backend/notification-service/notification-web/.gitignore
rename to notification-service/notification-web/.gitignore
diff --git a/dmp-backend/notification-service/notification-web/pom.xml b/notification-service/notification-web/pom.xml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/pom.xml
rename to notification-service/notification-web/pom.xml
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/NotificationApplication.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/NotificationApplication.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/NotificationApplication.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/NotificationApplication.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/WebConfiguration.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/WebConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/WebConfiguration.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/WebConfiguration.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/authorization/OwnedAuthorizationHandler.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/config/AppMessageSourceConfiguration.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/config/SecurityConfiguration.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/InAppNotificationController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/NotificationTemplateController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/PrincipalController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/TenantConfigurationController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/UserNotificationPreferenceController.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/UserNotificationPreferenceController.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/UserNotificationPreferenceController.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/UserNotificationPreferenceController.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/controllers/error/GenericErrorHandler.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptor.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheOptions.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/interceptors/UserInterceptorCacheService.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/Account.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/Account.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/Account.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/model/Account.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/model/AccountBuilder.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/QueryResult.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/QueryResult.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/model/QueryResult.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/model/QueryResult.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheOptions.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByCodeCacheService.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheOptions.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantByIdCacheService.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeClaimInterceptor.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeConfiguration.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeHeaderInterceptor.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantScopeProperties.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheOptions.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/UserAllowedTenantCacheService.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptor.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheOptions.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java b/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java
rename to notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/user/UserInterceptorCacheService.java
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/application.yml b/notification-service/notification-web/src/main/resources/config/application.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/application.yml
rename to notification-service/notification-web/src/main/resources/config/application.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/cache.yml b/notification-service/notification-web/src/main/resources/config/cache.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/cache.yml
rename to notification-service/notification-web/src/main/resources/config/cache.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/cipher.yml b/notification-service/notification-web/src/main/resources/config/cipher.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/cipher.yml
rename to notification-service/notification-web/src/main/resources/config/cipher.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/cors-devel.yml b/notification-service/notification-web/src/main/resources/config/cors-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/cors-devel.yml
rename to notification-service/notification-web/src/main/resources/config/cors-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/cors.yml b/notification-service/notification-web/src/main/resources/config/cors.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/cors.yml
rename to notification-service/notification-web/src/main/resources/config/cors.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/db-devel.yml b/notification-service/notification-web/src/main/resources/config/db-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/db-devel.yml
rename to notification-service/notification-web/src/main/resources/config/db-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/db.yml b/notification-service/notification-web/src/main/resources/config/db.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/db.yml
rename to notification-service/notification-web/src/main/resources/config/db.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/email.yml b/notification-service/notification-web/src/main/resources/config/email.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/email.yml
rename to notification-service/notification-web/src/main/resources/config/email.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/errors.yml b/notification-service/notification-web/src/main/resources/config/errors.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/errors.yml
rename to notification-service/notification-web/src/main/resources/config/errors.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/formatting.yml b/notification-service/notification-web/src/main/resources/config/formatting.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/formatting.yml
rename to notification-service/notification-web/src/main/resources/config/formatting.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/idpclaims.yml b/notification-service/notification-web/src/main/resources/config/idpclaims.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/idpclaims.yml
rename to notification-service/notification-web/src/main/resources/config/idpclaims.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/locale.yml b/notification-service/notification-web/src/main/resources/config/locale.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/locale.yml
rename to notification-service/notification-web/src/main/resources/config/locale.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/logging-devel.yml b/notification-service/notification-web/src/main/resources/config/logging-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/logging-devel.yml
rename to notification-service/notification-web/src/main/resources/config/logging-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/logging.yml b/notification-service/notification-web/src/main/resources/config/logging.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/logging.yml
rename to notification-service/notification-web/src/main/resources/config/logging.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/notification-devel.yml b/notification-service/notification-web/src/main/resources/config/notification-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/notification-devel.yml
rename to notification-service/notification-web/src/main/resources/config/notification-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml b/notification-service/notification-web/src/main/resources/config/notification.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/notification.yml
rename to notification-service/notification-web/src/main/resources/config/notification.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/permissions.yml b/notification-service/notification-web/src/main/resources/config/permissions.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/permissions.yml
rename to notification-service/notification-web/src/main/resources/config/permissions.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/queue-devel.yml b/notification-service/notification-web/src/main/resources/config/queue-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/queue-devel.yml
rename to notification-service/notification-web/src/main/resources/config/queue-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/queue.yml b/notification-service/notification-web/src/main/resources/config/queue.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/queue.yml
rename to notification-service/notification-web/src/main/resources/config/queue.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/security.yml b/notification-service/notification-web/src/main/resources/config/security.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/security.yml
rename to notification-service/notification-web/src/main/resources/config/security.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/server-devel.yml b/notification-service/notification-web/src/main/resources/config/server-devel.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/server-devel.yml
rename to notification-service/notification-web/src/main/resources/config/server-devel.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/server.yml b/notification-service/notification-web/src/main/resources/config/server.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/server.yml
rename to notification-service/notification-web/src/main/resources/config/server.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/config/tenant.yml b/notification-service/notification-web/src/main/resources/config/tenant.yml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/config/tenant.yml
rename to notification-service/notification-web/src/main/resources/config/tenant.yml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/logging/logback-dev.xml b/notification-service/notification-web/src/main/resources/logging/logback-dev.xml
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/logging/logback-dev.xml
rename to notification-service/notification-web/src/main/resources/logging/logback-dev.xml
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/messages/messages.properties b/notification-service/notification-web/src/main/resources/messages/messages.properties
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/messages/messages.properties
rename to notification-service/notification-web/src/main/resources/messages/messages.properties
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/messages/messages_el.properties b/notification-service/notification-web/src/main/resources/messages/messages_el.properties
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/messages/messages_el.properties
rename to notification-service/notification-web/src/main/resources/messages/messages_el.properties
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/descrptionfinalised/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpdeposit/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpfinalised/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexistinguser/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpinvitationexternaluser/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/dmpmodified/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/body.en.html b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/body.en.html
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/body.en.html
rename to notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/body.en.html
diff --git a/dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt
similarity index 100%
rename from dmp-backend/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt
rename to notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt
diff --git a/dmp-backend/notification-service/notification/.gitignore b/notification-service/notification/.gitignore
similarity index 100%
rename from dmp-backend/notification-service/notification/.gitignore
rename to notification-service/notification/.gitignore
diff --git a/dmp-backend/notification-service/notification/pom.xml b/notification-service/notification/pom.xml
similarity index 100%
rename from dmp-backend/notification-service/notification/pom.xml
rename to notification-service/notification/pom.xml
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/audit/AuditableAction.java b/notification-service/notification/src/main/java/gr/cite/notification/audit/AuditableAction.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/audit/AuditableAction.java
rename to notification-service/notification/src/main/java/gr/cite/notification/audit/AuditableAction.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java b/notification-service/notification/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java
rename to notification-service/notification/src/main/java/gr/cite/notification/authorization/AuthorizationFlags.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java b/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java
rename to notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedAuthorizationRequirement.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedResource.java b/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedResource.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedResource.java
rename to notification-service/notification/src/main/java/gr/cite/notification/authorization/OwnedResource.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/Permission.java b/notification-service/notification/src/main/java/gr/cite/notification/authorization/Permission.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/authorization/Permission.java
rename to notification-service/notification/src/main/java/gr/cite/notification/authorization/Permission.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java b/notification-service/notification/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/cache/FormattingUserprofileCacheCacheService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/cache/NotificationTemplateCache.java b/notification-service/notification/src/main/java/gr/cite/notification/cache/NotificationTemplateCache.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/cache/NotificationTemplateCache.java
rename to notification-service/notification/src/main/java/gr/cite/notification/cache/NotificationTemplateCache.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/JsonHandlingService.java b/notification-service/notification/src/main/java/gr/cite/notification/common/JsonHandlingService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/JsonHandlingService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/JsonHandlingService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/StringUtils.java b/notification-service/notification/src/main/java/gr/cite/notification/common/StringUtils.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/StringUtils.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/StringUtils.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/XmlHandlingService.java b/notification-service/notification/src/main/java/gr/cite/notification/common/XmlHandlingService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/XmlHandlingService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/XmlHandlingService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/ContactInfoType.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EmailOverrideMode.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EmailOverrideMode.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EmailOverrideMode.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/EmailOverrideMode.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EnumUtils.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EnumUtils.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/EnumUtils.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/EnumUtils.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/InAppNotificationPriority.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/InAppNotificationPriority.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/InAppNotificationPriority.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/InAppNotificationPriority.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/IsActive.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/IsActive.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/IsActive.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/IsActive.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationContactType.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationContactType.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationContactType.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationContactType.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationDataType.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationDataType.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationDataType.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationDataType.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationInAppTracking.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationInAppTracking.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationInAppTracking.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationInAppTracking.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationNotifyState.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationNotifyState.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationNotifyState.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationNotifyState.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateChannel.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateChannel.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateChannel.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateChannel.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateKind.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateKind.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateKind.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTemplateKind.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingProcess.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingProcess.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingProcess.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingProcess.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingState.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingState.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingState.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/NotificationTrackingState.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java b/notification-service/notification/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/enums/TenantConfigurationType.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java b/notification-service/notification/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestScope.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyConfiguration.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/MultitenancyProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScoped.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/user/UserScope.java b/notification-service/notification/src/main/java/gr/cite/notification/common/scope/user/UserScope.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/scope/user/UserScope.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/scope/user/UserScope.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/Attachment.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/Attachment.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/Attachment.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/Attachment.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/ContactPair.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/FieldInfo.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/FieldInfo.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/FieldInfo.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/FieldInfo.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/InAppTrackingData.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/InAppTrackingData.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/InAppTrackingData.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/InAppTrackingData.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationContactData.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationContactData.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationContactData.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationContactData.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationFieldData.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationFieldData.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationFieldData.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/NotificationFieldData.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/RouteTrackingData.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/RouteTrackingData.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/RouteTrackingData.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/RouteTrackingData.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/TrackingTrace.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/TrackingTrace.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/TrackingTrace.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notification/TrackingTrace.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldInfoEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldInfoEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldInfoEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldInfoEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldOptionsEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldOptionsEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldOptionsEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/FieldOptionsEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/NotificationTemplateValueEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/NotificationTemplateValueEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/NotificationTemplateValueEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/notificationtemplate/NotificationTemplateValueEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantConfigEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantDepositConfigEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantFileTransformersConfigEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenant/TenantSourceEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/DefaultUserLocaleConfigurationDataContainer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/EmailClientConfigurationDataContainer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/NotifierListConfigurationDataContainer.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/NotifierListConfigurationDataContainer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/NotifierListConfigurationDataContainer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/tenantconfiguration/NotifierListConfigurationDataContainer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/user/AdditionalInfoEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java b/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/types/xml/XmlSerializable.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/validation/BaseValidator.java b/notification-service/notification/src/main/java/gr/cite/notification/common/validation/BaseValidator.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/common/validation/BaseValidator.java
rename to notification-service/notification/src/main/java/gr/cite/notification/common/validation/BaseValidator.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/db/NamingStrategyProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java b/notification-service/notification/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/db/PrefixPhysicalNamingStrategy.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailConfig.java b/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailConfig.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailConfig.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailConfig.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/email/EmailProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java b/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceConfiguration.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingServiceProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java b/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/formatting/FormattingUserprofileCacheOptions.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationConfig.java b/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationConfig.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationConfig.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationConfig.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationTemplateCacheOptions.java b/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationTemplateCacheOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationTemplateCacheOptions.java
rename to notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationTemplateCacheOptions.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionService.java b/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/convention/ConventionServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/InAppNotificationEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/InAppNotificationEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/InAppNotificationEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/InAppNotificationEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/LanguageEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/LanguageEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/LanguageEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/LanguageEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/NotificationEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationTemplateEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationTemplateEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/NotificationTemplateEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/NotificationTemplateEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/QueueInboxEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/QueueInboxEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/QueueInboxEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/QueueInboxEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/QueueOutboxEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/TenantConfigurationEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/TenantEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/TenantEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java b/notification-service/notification/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/TenantScopedEntityManager.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantUserEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/TenantUserEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/TenantUserEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/TenantUserEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/UserContactInfoEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/UserCredentialEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/UserEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserNotificationPreferenceEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserNotificationPreferenceEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserNotificationPreferenceEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/UserNotificationPreferenceEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserRoleEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/UserRoleEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/UserRoleEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/UserRoleEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/composite/CompositeUserNotificationPreferenceId.java b/notification-service/notification/src/main/java/gr/cite/notification/data/composite/CompositeUserNotificationPreferenceId.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/composite/CompositeUserNotificationPreferenceId.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/composite/CompositeUserNotificationPreferenceId.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/ContactInfoTypeConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnum.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/DatabaseEnumConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/InAppNotificationPriorityConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/InAppNotificationPriorityConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/InAppNotificationPriorityConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/InAppNotificationPriorityConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/IsActiveConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationContactTypeConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationContactTypeConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationContactTypeConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationContactTypeConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationInAppTrackingConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationInAppTrackingConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationInAppTrackingConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationInAppTrackingConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationNotifyStateConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationNotifyStateConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationNotifyStateConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationNotifyStateConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateChannelConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateChannelConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateChannelConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateChannelConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateKindConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateKindConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateKindConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTemplateKindConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingProcessConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingProcessConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingProcessConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingProcessConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingStateConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingStateConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingStateConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/NotificationTrackingStateConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java b/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/conventers/TenantConfigurationTypeConverter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java b/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantListener.java b/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantListener.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantListener.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantListener.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java b/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/types/JsonSQLType.java b/notification-service/notification/src/main/java/gr/cite/notification/data/types/JsonSQLType.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/data/types/JsonSQLType.java
rename to notification-service/notification/src/main/java/gr/cite/notification/data/types/JsonSQLType.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java b/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java
rename to notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorDescription.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java b/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java
rename to notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusConfiguration.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/errorcode/ErrorThesaurusProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/EventBroker.java b/notification-service/notification/src/main/java/gr/cite/notification/event/EventBroker.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/EventBroker.java
rename to notification-service/notification/src/main/java/gr/cite/notification/event/EventBroker.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/event/TenantTouchedEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/event/UserAddedToTenantEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/event/UserRemovedFromTenantEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserTouchedEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/event/UserTouchedEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/event/UserTouchedEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/event/UserTouchedEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/AppRabbitConfigurer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/IntegrationEventContextImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/TrackedEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/ConsistencyPredicates.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/EventProcessingStatus.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxPrincipal.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/IntegrationEventProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyPredicates.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyPredicates.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyPredicates.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyConsistencyPredicates.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandlerImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandlerImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandlerImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandlerImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalConsistencyPredicates.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantremoval/TenantRemovalIntegrationEventHandlerImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenanttouched/TenantTouchedIntegrationEventHandlerImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalConsistencyPredicates.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandler.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxIntegrationEvent.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java b/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java
rename to notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleConfiguration.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleProperties.java b/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleProperties.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleProperties.java
rename to notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleProperties.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleService.java b/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/locale/LocaleServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/InAppNotification.java b/notification-service/notification/src/main/java/gr/cite/notification/model/InAppNotification.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/InAppNotification.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/InAppNotification.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Language.java b/notification-service/notification/src/main/java/gr/cite/notification/model/Language.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Language.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/Language.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Notification.java b/notification-service/notification/src/main/java/gr/cite/notification/model/Notification.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Notification.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/Notification.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/NotificationTemplate.java b/notification-service/notification/src/main/java/gr/cite/notification/model/NotificationTemplate.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/NotificationTemplate.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/NotificationTemplate.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/SendNotificationResult.java b/notification-service/notification/src/main/java/gr/cite/notification/model/SendNotificationResult.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/SendNotificationResult.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/SendNotificationResult.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Tenant.java b/notification-service/notification/src/main/java/gr/cite/notification/model/Tenant.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/Tenant.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/Tenant.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/TenantConfiguration.java b/notification-service/notification/src/main/java/gr/cite/notification/model/TenantConfiguration.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/TenantConfiguration.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/TenantConfiguration.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/User.java b/notification-service/notification/src/main/java/gr/cite/notification/model/User.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/User.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/User.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java b/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/UserContactInfo.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserCredential.java b/notification-service/notification/src/main/java/gr/cite/notification/model/UserCredential.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserCredential.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/UserCredential.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserNotificationPreference.java b/notification-service/notification/src/main/java/gr/cite/notification/model/UserNotificationPreference.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserNotificationPreference.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/UserNotificationPreference.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserRole.java b/notification-service/notification/src/main/java/gr/cite/notification/model/UserRole.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/UserRole.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/UserRole.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/InAppNotificationBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/InAppNotificationBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/InAppNotificationBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/InAppNotificationBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/LanguageBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/LanguageBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/LanguageBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/LanguageBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationTemplateBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationTemplateBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationTemplateBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/NotificationTemplateBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/TenantConfigurationBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserContactInfoBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserNotificationPreferenceBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserNotificationPreferenceBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserNotificationPreferenceBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/UserNotificationPreferenceBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldInfoBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldInfoBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldInfoBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldInfoBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldOptionsBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldOptionsBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldOptionsBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/FieldOptionsBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/NotificationTemplateValueBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/NotificationTemplateValueBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/NotificationTemplateValueBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/notificationtemplate/NotificationTemplateValueBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantConfigBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantDepositConfigBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantFileTransformersBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/builder/tenantconfig/TenantSourceBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/BaseCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/InAppNotificationCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/InAppNotificationCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/InAppNotificationCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/InAppNotificationCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationTemplateCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationTemplateCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationTemplateCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/NotificationTemplateCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/TenantConfigurationCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserContactInfoCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserNotificationPreferenceCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserNotificationPreferenceCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserNotificationPreferenceCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/UserNotificationPreferenceCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldInfoCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldInfoCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldInfoCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldInfoCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldOptionsCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldOptionsCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldOptionsCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/FieldOptionsCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/NotificationTemplateValueCensor.java b/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/NotificationTemplateValueCensor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/NotificationTemplateValueCensor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/censorship/notificationtemplate/NotificationTemplateValueCensor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/InAppNotificationDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/InAppNotificationDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/InAppNotificationDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/InAppNotificationDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationTemplateDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationTemplateDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationTemplateDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/NotificationTemplateDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantConfigurationDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/TenantDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserContactInfoDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserContactInfoDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserContactInfoDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserContactInfoDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java b/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/FieldOptions.java b/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/FieldOptions.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/FieldOptions.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/FieldOptions.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/NotificationTemplateValue.java b/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/NotificationTemplateValue.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/NotificationTemplateValue.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/notificationtemplate/NotificationTemplateValue.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationTemplatePersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationTemplatePersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationTemplatePersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/NotificationTemplatePersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/TenantTouchedIntegrationEventPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserNotificationPreferencePersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserNotificationPreferencePersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserNotificationPreferencePersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserNotificationPreferencePersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/UserTouchedIntegrationEventPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldInfoPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldInfoPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldInfoPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldInfoPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldOptionsPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldOptionsPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldOptionsPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/FieldOptionsPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/NotificationTemplateValuePersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/NotificationTemplateValuePersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/NotificationTemplateValuePersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/notificationtemplate/NotificationTemplateValuePersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationEmailClientPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationNotifierListPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationNotifierListPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationNotifierListPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationNotifierListPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java b/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/persist/tenantconfiguration/TenantConfigurationUserLocaleIntegrationPersist.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java b/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantConfig.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java b/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantDepositConfig.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java b/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantFileTransformersConfig.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java b/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/tenantconfig/TenantSource.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/user/PublicUser.java b/notification-service/notification/src/main/java/gr/cite/notification/model/user/PublicUser.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/model/user/PublicUser.java
rename to notification-service/notification/src/main/java/gr/cite/notification/model/user/PublicUser.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/InAppNotificationQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/LanguageQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/LanguageQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/LanguageQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/LanguageQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/NotificationQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/NotificationTemplateQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/QueueInboxQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/QueueOutboxQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/TenantConfigurationQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/TenantQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/UserContactInfoQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/UserCredentialQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/UserNotificationPreferenceQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/UserQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java b/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/UserRoleQuery.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/InAppNotificationLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/InAppNotificationLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/InAppNotificationLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/InAppNotificationLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/LanguageLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/LanguageLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/LanguageLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/LanguageLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationTemplateLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationTemplateLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationTemplateLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotificationTemplateLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotifierListLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotifierListLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotifierListLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/NotifierListLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantConfigurationLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/TenantLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserContactInfoLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserNotificationPreferenceLookup.java b/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserNotificationPreferenceLookup.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserNotificationPreferenceLookup.java
rename to notification-service/notification/src/main/java/gr/cite/notification/query/lookup/UserNotificationPreferenceLookup.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/NotificationScheduleTask.java b/notification-service/notification/src/main/java/gr/cite/notification/schedule/NotificationScheduleTask.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/NotificationScheduleTask.java
rename to notification-service/notification/src/main/java/gr/cite/notification/schedule/NotificationScheduleTask.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/CandidateInfo.java b/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/CandidateInfo.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/CandidateInfo.java
rename to notification-service/notification/src/main/java/gr/cite/notification/schedule/model/CandidateInfo.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/MiniTenant.java b/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/MiniTenant.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/schedule/model/MiniTenant.java
rename to notification-service/notification/src/main/java/gr/cite/notification/schedule/model/MiniTenant.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/AuthnSandbox.java b/notification-service/notification/src/main/java/gr/cite/notification/service/AuthnSandbox.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/AuthnSandbox.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/AuthnSandbox.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/channelResolution/ChannelResolutionServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractor.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractorFactory.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractorFactory.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractorFactory.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/ContactExtractorFactory.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/EmailContactExtractor.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/EmailContactExtractor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/EmailContactExtractor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/EmailContactExtractor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/InAppContactExtractor.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/InAppContactExtractor.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/InAppContactExtractor.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/InAppContactExtractor.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/Contact.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/Contact.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/Contact.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/Contact.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/EmailContact.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/EmailContact.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/EmailContact.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/EmailContact.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/InAppContact.java b/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/InAppContact.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/InAppContact.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/contact/model/InAppContact.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/formatting/FormattingServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/inappnotification/InAppNotificationServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/EmailMessageBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/EmailMessageBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/EmailMessageBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/EmailMessageBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/InAppMessageBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/InAppMessageBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/InAppMessageBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/InAppMessageBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilder.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilder.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilder.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilder.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilderFactory.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilderFactory.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilderFactory.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/builder/MessageBuilderFactory.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/common/MessageBuilderBase.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/common/MessageBuilderBase.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/common/MessageBuilderBase.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/common/MessageBuilderBase.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageBuilderServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageBuilderServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageBuilderServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageBuilderServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageInfoBuilderService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageInfoBuilderService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageInfoBuilderService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/infobuilder/MessageInfoBuilderService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/EmailMessage.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/EmailMessage.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/EmailMessage.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/model/EmailMessage.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/InAppMessage.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/InAppMessage.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/InAppMessage.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/model/InAppMessage.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/Message.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/Message.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/Message.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/model/Message.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/MessageInfo.java b/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/MessageInfo.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/message/model/MessageInfo.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/message/model/MessageInfo.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationServiceTemplateImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationServiceTemplateImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationServiceTemplateImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationServiceTemplateImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationTemplateService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationTemplateService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationTemplateService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notificationtemplate/NotificationTemplateService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/EmailNotifier.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notify/EmailNotifier.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/EmailNotifier.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notify/EmailNotifier.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/InAppNotifier.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notify/InAppNotifier.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/InAppNotifier.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notify/InAppNotifier.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/NotifierFactory.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notify/NotifierFactory.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/NotifierFactory.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notify/NotifierFactory.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/Notify.java b/notification-service/notification/src/main/java/gr/cite/notification/service/notify/Notify.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/notify/Notify.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/notify/Notify.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/tenant/TenantServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/tenantconfiguration/TenantConfigurationServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/EmailTracker.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/EmailTracker.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/EmailTracker.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/EmailTracker.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/InAppTracker.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/InAppTracker.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/InAppTracker.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/InAppTracker.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/Track.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/Track.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/Track.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/Track.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/TrackingFactory.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/TrackingFactory.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/TrackingFactory.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/TrackingFactory.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackerResponse.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackerResponse.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackerResponse.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackerResponse.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackingTraceData.java b/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackingTraceData.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackingTraceData.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/track/model/TrackingTraceData.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/user/UserService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceService.java b/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceService.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceService.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceService.java
diff --git a/dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceServiceImpl.java b/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceServiceImpl.java
similarity index 100%
rename from dmp-backend/notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceServiceImpl.java
rename to notification-service/notification/src/main/java/gr/cite/notification/service/userNotificationPreference/UserNotificationPreferenceServiceImpl.java
diff --git a/dmp-backend/notification-service/pom.xml b/notification-service/pom.xml
similarity index 100%
rename from dmp-backend/notification-service/pom.xml
rename to notification-service/pom.xml
diff --git a/dmp-backend/notification-service/settings.xml b/notification-service/settings.xml
similarity index 100%
rename from dmp-backend/notification-service/settings.xml
rename to notification-service/settings.xml