diff --git a/config/http/static/default.json b/config/http/static/default.json
index 9188cc64e..18c7bc92d 100644
--- a/config/http/static/default.json
+++ b/config/http/static/default.json
@@ -24,7 +24,7 @@
         },
         {
           "StaticAssetHandler:_assets_key": "/idp/style.css",
-          "StaticAssetHandler:_assets_value": "$PACKAGE_ROOT/templates/idp/email-password-interaction/main.css"
+          "StaticAssetHandler:_assets_value": "$PACKAGE_ROOT/templates/identity/email-password/main.css"
         }
       ]
     }
diff --git a/config/identity/handler/interaction/handlers/forgot-password.json b/config/identity/handler/interaction/handlers/forgot-password.json
index 0cab5dcc0..cfcacc131 100644
--- a/config/identity/handler/interaction/handlers/forgot-password.json
+++ b/config/identity/handler/interaction/handlers/forgot-password.json
@@ -14,7 +14,7 @@
         "args_idpPath": "/idp",
         "args_templateEngine": {
           "@type": "EjsTemplateEngine",
-          "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/resetPasswordEmail.ejs"
+          "template": "$PACKAGE_ROOT/templates/identity/email-password/reset-password-email.html.ejs"
         },
         "args_emailSender": { "@id": "urn:solid-server:default:EmailSender" }
       },
@@ -27,7 +27,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/emailSent.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/email-sent.html.ejs"
       }
     },
     {
@@ -36,7 +36,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/forgotPassword.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/forgot-password.html.ejs"
       }
     }
   ]
diff --git a/config/identity/handler/interaction/handlers/initial.json b/config/identity/handler/interaction/handlers/initial.json
index 623f2f595..c4639e91a 100644
--- a/config/identity/handler/interaction/handlers/initial.json
+++ b/config/identity/handler/interaction/handlers/initial.json
@@ -16,7 +16,7 @@
               "@type": "TemplateHandler",
               "templateEngine": {
                 "@type": "EjsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/confirm.ejs"
+                "template": "$PACKAGE_ROOT/templates/identity/email-password/confirm.html.ejs"
               }
             }
           }
diff --git a/config/identity/handler/interaction/handlers/login.json b/config/identity/handler/interaction/handlers/login.json
index 3ccaa4e4a..de34b6cc5 100644
--- a/config/identity/handler/interaction/handlers/login.json
+++ b/config/identity/handler/interaction/handlers/login.json
@@ -20,7 +20,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/login.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/login.html.ejs"
       }
     }
   ]
diff --git a/config/identity/handler/interaction/handlers/registration.json b/config/identity/handler/interaction/handlers/registration.json
index d5e068f01..5bf89125c 100644
--- a/config/identity/handler/interaction/handlers/registration.json
+++ b/config/identity/handler/interaction/handlers/registration.json
@@ -25,7 +25,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/register.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/register.html.ejs"
       }
     },
     {
@@ -34,7 +34,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/registerResponse.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/register-response.html.ejs"
       }
     }
   ]
diff --git a/config/identity/handler/interaction/handlers/reset-password.json b/config/identity/handler/interaction/handlers/reset-password.json
index f6381ba2a..042bf59f5 100644
--- a/config/identity/handler/interaction/handlers/reset-password.json
+++ b/config/identity/handler/interaction/handlers/reset-password.json
@@ -33,7 +33,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/resetPassword.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/reset-password.html.ejs"
       }
     },
     {
@@ -42,7 +42,7 @@
       "@type": "TemplateHandler",
       "templateEngine": {
         "@type": "EjsTemplateEngine",
-        "template": "$PACKAGE_ROOT/templates/idp/email-password-interaction/message.ejs"
+        "template": "$PACKAGE_ROOT/templates/identity/email-password/message.html.ejs"
       }
     }
   ]
diff --git a/config/util/representation-conversion/default.json b/config/util/representation-conversion/default.json
index 1f111e45d..ea52c0c9e 100644
--- a/config/util/representation-conversion/default.json
+++ b/config/util/representation-conversion/default.json
@@ -30,10 +30,10 @@
               "@type": "ErrorToTemplateConverter",
               "templateEngine": {
                 "@type": "HandlebarsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/error/main.md"
+                "template": "$PACKAGE_ROOT/templates/error/main.md.hbs"
               },
               "templatePath": "$PACKAGE_ROOT/templates/error/descriptions/",
-              "extension": ".md",
+              "extension": ".md.hbs",
               "contentType": "text/markdown"
             },
             {
@@ -42,7 +42,7 @@
               "templateEngine": {
                 "@id": "urn:solid-server:default:MainTemplateEngine",
                 "@type": "HandlebarsTemplateEngine",
-                "template": "$PACKAGE_ROOT/templates/main.html"
+                "template": "$PACKAGE_ROOT/templates/main.html.hbs"
               }
             }
           ]
diff --git a/templates/error/descriptions/E0001.md b/templates/error/descriptions/E0001.md.hbs
similarity index 100%
rename from templates/error/descriptions/E0001.md
rename to templates/error/descriptions/E0001.md.hbs
diff --git a/templates/error/descriptions/H400.md b/templates/error/descriptions/H400.md.hbs
similarity index 100%
rename from templates/error/descriptions/H400.md
rename to templates/error/descriptions/H400.md.hbs
diff --git a/templates/error/descriptions/H401.md b/templates/error/descriptions/H401.md.hbs
similarity index 100%
rename from templates/error/descriptions/H401.md
rename to templates/error/descriptions/H401.md.hbs
diff --git a/templates/error/descriptions/H403.md b/templates/error/descriptions/H403.md.hbs
similarity index 100%
rename from templates/error/descriptions/H403.md
rename to templates/error/descriptions/H403.md.hbs
diff --git a/templates/error/descriptions/H404.md b/templates/error/descriptions/H404.md.hbs
similarity index 100%
rename from templates/error/descriptions/H404.md
rename to templates/error/descriptions/H404.md.hbs
diff --git a/templates/error/descriptions/H500.md b/templates/error/descriptions/H500.md.hbs
similarity index 100%
rename from templates/error/descriptions/H500.md
rename to templates/error/descriptions/H500.md.hbs
diff --git a/templates/error/descriptions/H501.md b/templates/error/descriptions/H501.md.hbs
similarity index 100%
rename from templates/error/descriptions/H501.md
rename to templates/error/descriptions/H501.md.hbs
diff --git a/templates/error/main.md b/templates/error/main.md.hbs
similarity index 100%
rename from templates/error/main.md
rename to templates/error/main.md.hbs
diff --git a/templates/idp/email-password-interaction/confirm.ejs b/templates/identity/email-password/confirm.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/confirm.ejs
rename to templates/identity/email-password/confirm.html.ejs
diff --git a/templates/idp/email-password-interaction/emailSent.ejs b/templates/identity/email-password/email-sent.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/emailSent.ejs
rename to templates/identity/email-password/email-sent.html.ejs
diff --git a/templates/idp/email-password-interaction/forgotPassword.ejs b/templates/identity/email-password/forgot-password.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/forgotPassword.ejs
rename to templates/identity/email-password/forgot-password.html.ejs
diff --git a/templates/idp/email-password-interaction/login.ejs b/templates/identity/email-password/login.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/login.ejs
rename to templates/identity/email-password/login.html.ejs
diff --git a/templates/idp/email-password-interaction/message.ejs b/templates/identity/email-password/message.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/message.ejs
rename to templates/identity/email-password/message.html.ejs
diff --git a/templates/idp/email-password-interaction/registerResponse.ejs b/templates/identity/email-password/register-response.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/registerResponse.ejs
rename to templates/identity/email-password/register-response.html.ejs
diff --git a/templates/idp/email-password-interaction/register.ejs b/templates/identity/email-password/register.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/register.ejs
rename to templates/identity/email-password/register.html.ejs
diff --git a/templates/idp/email-password-interaction/resetPasswordEmail.ejs b/templates/identity/email-password/reset-password-email.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/resetPasswordEmail.ejs
rename to templates/identity/email-password/reset-password-email.html.ejs
diff --git a/templates/idp/email-password-interaction/resetPassword.ejs b/templates/identity/email-password/reset-password.html.ejs
similarity index 100%
rename from templates/idp/email-password-interaction/resetPassword.ejs
rename to templates/identity/email-password/reset-password.html.ejs
diff --git a/templates/main.html b/templates/main.html.hbs
similarity index 100%
rename from templates/main.html
rename to templates/main.html.hbs