diff --git a/.gitmodules b/.gitmodules
index 233b936..04cb225 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "lib/certvalidator"]
-	path = lib/certvalidator
+	path = stapled/lib/certvalidator
 	url = https://github.com/wbond/certvalidator.git
 [submodule "lib/ocspbuilder"]
-	path = lib/ocspbuilder
+	path = stapled/lib/ocspbuilder
 	url = https://github.com/wbond/ocspbuilder.git
 [submodule "lib/asn1crypto"]
-	path = lib/asn1crypto
+	path = stapled/lib/asn1crypto
 	url = https://github.com/wbond/asn1crypto.git
 [submodule "lib/oscrypto"]
-	path = lib/oscrypto
+	path = stapled/lib/oscrypto
 	url = https://github.com/wbond/oscrypto.git
diff --git a/docs/source/conf.py b/docs/source/conf.py
index cf960b0..3248358 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -15,7 +15,7 @@
 import sys
 import sphinx_rtd_theme
 sys.path.insert(0, os.path.abspath('../..'))
-from lib import add_paths
+from stapled.lib import add_paths
 add_paths()
 
 # -- General configuration ------------------------------------------------
diff --git a/setup.py b/setup.py
index 42eb3fc..6a70ccd 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import setup
 from setuptools import find_packages
 from stapled.version import __version__
-from lib import find_lib_paths, find_lib_path_dict
+from stapled.lib import find_lib_paths, find_lib_path_dict
 
 
 def all_packages():
diff --git a/stapled/__init__.py b/stapled/__init__.py
index e658f12..254bdcf 100644
--- a/stapled/__init__.py
+++ b/stapled/__init__.py
@@ -8,7 +8,7 @@
 import sys
 import os
 from stapled.version import __version__, __app_name__
-from lib import add_paths
+from stapled.lib import add_paths
 
 if add_paths():
     LOCAL_LIB_MODE = True
diff --git a/lib/__init__.py b/stapled/lib/__init__.py
similarity index 100%
rename from lib/__init__.py
rename to stapled/lib/__init__.py
diff --git a/lib/asn1crypto b/stapled/lib/asn1crypto
similarity index 100%
rename from lib/asn1crypto
rename to stapled/lib/asn1crypto
diff --git a/lib/certvalidator b/stapled/lib/certvalidator
similarity index 100%
rename from lib/certvalidator
rename to stapled/lib/certvalidator
diff --git a/lib/ocspbuilder b/stapled/lib/ocspbuilder
similarity index 100%
rename from lib/ocspbuilder
rename to stapled/lib/ocspbuilder
diff --git a/lib/oscrypto b/stapled/lib/oscrypto
similarity index 100%
rename from lib/oscrypto
rename to stapled/lib/oscrypto