diff --git a/src/python/jw/pkg/build/cmds/CmdGetAuthInfo.py b/src/python/jw/pkg/build/cmds/CmdGetAuthInfo.py
index 1fc17fc1..74e17e73 100644
--- a/src/python/jw/pkg/build/cmds/CmdGetAuthInfo.py
+++ b/src/python/jw/pkg/build/cmds/CmdGetAuthInfo.py
@@ -5,7 +5,7 @@ from argparse import Namespace, ArgumentParser
 from urllib.parse import urlparse
 
 from ..Cmd import Cmd
-from ..lib.util import run_cmd
+from ...lib.util import run_cmd
 
 class CmdGetAuthInfo(Cmd): # export
 
diff --git a/src/python/jw/pkg/build/cmds/CmdListRepos.py b/src/python/jw/pkg/build/cmds/CmdListRepos.py
index 0c85f4e2..3efade68 100644
--- a/src/python/jw/pkg/build/cmds/CmdListRepos.py
+++ b/src/python/jw/pkg/build/cmds/CmdListRepos.py
@@ -4,7 +4,7 @@ import re, os
 from argparse import Namespace, ArgumentParser
 
 from ..Cmd import Cmd
-from ..lib.util import get_username, get_password, run_curl
+from ...lib.util import get_username, get_password, run_curl
 
 class CmdListRepos(Cmd): # export
 
@@ -31,7 +31,7 @@ class CmdListRepos(Cmd): # export
         match url.scheme:
             case 'ssh':
                 if re.match(r'ssh://.*git\.janware\.com/', args.base_url):
-                    from jw.pkg.build.lib.SSHClient import SSHClientCmd as SSHClient
+                    from jw.pkg.lib.SSHClient import SSHClientCmd as SSHClient
                     ssh = SSHClient(hostname=url.hostname)
                     if username is not None:
                         ssh.set_username(username)
diff --git a/src/python/jw/pkg/build/lib/Makefile b/src/python/jw/pkg/lib/Makefile
similarity index 70%
rename from src/python/jw/pkg/build/lib/Makefile
rename to src/python/jw/pkg/lib/Makefile
index 7a83c333..781b0c8c 100644
--- a/src/python/jw/pkg/build/lib/Makefile
+++ b/src/python/jw/pkg/lib/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../../../../..
+TOPDIR = ../../../../..
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/py-mod.mk
diff --git a/src/python/jw/pkg/build/lib/SSHClient.py b/src/python/jw/pkg/lib/SSHClient.py
similarity index 100%
rename from src/python/jw/pkg/build/lib/SSHClient.py
rename to src/python/jw/pkg/lib/SSHClient.py
diff --git a/src/python/jw/pkg/build/lib/util.py b/src/python/jw/pkg/lib/util.py
similarity index 100%
rename from src/python/jw/pkg/build/lib/util.py
rename to src/python/jw/pkg/lib/util.py