diff --git a/bin/static b/bin/static
index eb2409295b1a5e5e2136f91b5503b5feb17487fc..47af95441d6858387a0bfa09918fef5c124bdc52 100755
--- a/bin/static
+++ b/bin/static
@@ -26,7 +26,7 @@ metrics = require('../lib/metrics.js'),
 logger = require('../lib/logging.js').logger,
 forward = require('../lib/http_forward').forward,
 shutdown = require('../lib/shutdown'),
-views = require('../lib/browserid/views.js');
+views = require('../lib/static/views.js');
 
 var app = undefined;
 
diff --git a/lib/email.js b/lib/email.js
index bf83bdc6d77491cd519e4294824b5c92f3b68569..e4bfd894a4d8b6dca2439066655e015725fa021b 100644
--- a/lib/email.js
+++ b/lib/email.js
@@ -28,7 +28,7 @@ if (smtp_params && smtp_params.host) {
 }
 
 const template = ejs.compile(
-    fs.readFileSync(path.join(__dirname, "browserid", "prove_template.ejs")).toString());
+    fs.readFileSync(path.join(__dirname, "static", "prove_template.ejs")).toString());
 
 var interceptor = undefined;
 
diff --git a/lib/browserid/fake_verification.js b/lib/static/fake_verification.js
similarity index 100%
rename from lib/browserid/fake_verification.js
rename to lib/static/fake_verification.js
diff --git a/lib/browserid/prove_template.ejs b/lib/static/prove_template.ejs
similarity index 100%
rename from lib/browserid/prove_template.ejs
rename to lib/static/prove_template.ejs
diff --git a/lib/browserid/views.js b/lib/static/views.js
similarity index 100%
rename from lib/browserid/views.js
rename to lib/static/views.js