diff --git a/client-webserver/client.py b/client-webserver/client.py
index f517e4f15..7cbe50bc7 100755
--- a/client-webserver/client.py
+++ b/client-webserver/client.py
@@ -4,15 +4,22 @@ from chocolate_protocol_pb2 import chocolatemessage
 import M2Crypto
 import urllib2, os, grp, pwd, sys, time, random, sys, hashlib, subprocess
 import dialog, getopt
+
 import sni_challenge
 import configurator
+#from trustify import sni_challenge
+#from trustify import configurator
+
 # It is OK to use the upstream M2Crypto here instead of our modified
 # version.
 
 # bits of hashcash to generate
 from CONFIG import difficulty
+#from trustify.CONFIG import difficulty
+
 #Trustify certificate and chain files
 from CONFIG import cert_file, chain_file
+#from trustify.CONFIG import cert_file, chain_file
 
 def sha256(m):
     return hashlib.sha256(m).hexdigest()
diff --git a/client-webserver/configurator.py b/client-webserver/configurator.py
index 025da5a3e..a1c1b4e4e 100644
--- a/client-webserver/configurator.py
+++ b/client-webserver/configurator.py
@@ -6,6 +6,7 @@ import sys
 import socket
 
 from CONFIG import SERVER_ROOT
+#from trustify.CONFIG import SERVER_ROOT
 
 class VH(object):
     def __init__(self, vh_path, vh_addrs):
diff --git a/client-webserver/sni_challenge.py b/client-webserver/sni_challenge.py
index 25b6ad9af..31c7a6fc7 100644
--- a/client-webserver/sni_challenge.py
+++ b/client-webserver/sni_challenge.py
@@ -9,11 +9,19 @@ from shutil import move
 from os import remove, close, path
 import binascii
 import augeas
+
 import configurator
+#from trustify import configurator
 
 from CONFIG import CONFIG_DIR, WORK_DIR, SERVER_ROOT
 from CONFIG import CHOC_CERT_CONF, OPTIONS_SSL_CONF, APACHE_CHALLENGE_CONF
 from CONFIG import S_SIZE, NONCE_SIZE
+#Once directory changes to trustify and becomes package
+#from trustify.CONFIG import CONFIG_DIR, WORK_DIR, SERVER_ROOT
+#from trustify.CONFIG import CHOC_CERT_CONF, OPTIONS_SSL_CONF
+#from trustify.CONFIG import APACHE_CHALLENGE_CONF
+#from trustify.CONFIG import S_SIZE, NONCE_SIZE
+
 
 def getChocCertFile(nonce):
     """