diff --git a/serve/serve.go b/serve/serve.go
index 1a2807e..530d2f8 100644
--- a/serve/serve.go
+++ b/serve/serve.go
@@ -20,7 +20,8 @@ type Client struct {
 
 func NewClient(hostname string, lang string, os string, arch string) (*Client, error) {
 	m := &Client{
-		TBD: tbget.NewTBDownloader(lang, os, arch),
+		hostname: hostname,
+		TBD:      tbget.NewTBDownloader(lang, os, arch),
 	}
 	tgz, sig, err := m.TBD.DownloadUpdaterForLang(lang)
 	if err != nil {
diff --git a/tor-browser/lib/shellservice.jar b/tor-browser/lib/shellservice.jar
index 47c5b8e..0b32cd4 100644
Binary files a/tor-browser/lib/shellservice.jar and b/tor-browser/lib/shellservice.jar differ
diff --git a/tor-browser/TPO-signing-key.pub b/tor-browser/tor-browser/TPO-signing-key.pub
similarity index 100%
rename from tor-browser/TPO-signing-key.pub
rename to tor-browser/tor-browser/TPO-signing-key.pub
diff --git a/tor-browser/tor-browser/keep b/tor-browser/tor-browser/keep
new file mode 100644
index 0000000..e69de29