diff --git a/lib/browserid/primary.js b/lib/primary.js
similarity index 99%
rename from lib/browserid/primary.js
rename to lib/primary.js
index f9596c2234069533ab978ac3405f80f98ecb8332..c76a80af9a5723d98ecb53bf3e18943315e21be2 100644
--- a/lib/browserid/primary.js
+++ b/lib/primary.js
@@ -40,7 +40,7 @@
 
 const
 https = require('https'),
-logger = require('../logging.js').logger,
+logger = require('./logging.js').logger,
 urlparse = require('urlparse'),
 jwk = require('jwcrypto/jwk'),
 jwcert = require("jwcrypto/jwcert"),
diff --git a/lib/wsapi/address_info.js b/lib/wsapi/address_info.js
index b7cae9963aa8f74c72e998e29726ad4e8694b318..15c7f0e6a486a3c5c35f520513818ee665cec8f2 100644
--- a/lib/wsapi/address_info.js
+++ b/lib/wsapi/address_info.js
@@ -1,6 +1,6 @@
 const
 db = require('../db.js'),
-primary = require('../browserid/primary.js');
+primary = require('../primary.js');
 
 // return information about an email address.
 //   type:  is this an address with 'primary' or 'secondary' support?
diff --git a/lib/wsapi/auth_with_assertion.js b/lib/wsapi/auth_with_assertion.js
index 90729e65a4effae8d0bb485c81ff209f99b88e56..be666117232b8310cf85c2dc963776928f2d5d0b 100644
--- a/lib/wsapi/auth_with_assertion.js
+++ b/lib/wsapi/auth_with_assertion.js
@@ -4,7 +4,7 @@ wsapi = require('../wsapi.js'),
 httputils = require('../httputils'),
 logger = require('../logging.js').logger,
 querystring = require('querystring'),
-primary = require('../browserid/primary.js'),
+primary = require('../primary.js'),
 http = require('http'),
 https = require('https');
 
diff --git a/lib/wsapi/create_account_with_assertion.js b/lib/wsapi/create_account_with_assertion.js
index 90c2d7c2b3243a95d6b44055eb09a65cb7a86b06..82c9f431e9ce28a233036491950374e3842a5cb3 100644
--- a/lib/wsapi/create_account_with_assertion.js
+++ b/lib/wsapi/create_account_with_assertion.js
@@ -2,7 +2,7 @@ const
 db = require('../db.js'),
 wsapi = require('../wsapi.js'),
 httputils = require('../httputils'),
-primary = require('../browserid/primary.js'),
+primary = require('../primary.js'),
 logger = require('../logging.js').logger;
 
 exports.method = 'post';