diff --git a/bs4/__init__.py b/lib/bs4/__init__.py
similarity index 100%
rename from bs4/__init__.py
rename to lib/bs4/__init__.py
diff --git a/bs4/builder/__init__.py b/lib/bs4/builder/__init__.py
similarity index 100%
rename from bs4/builder/__init__.py
rename to lib/bs4/builder/__init__.py
diff --git a/bs4/builder/_html5lib.py b/lib/bs4/builder/_html5lib.py
similarity index 100%
rename from bs4/builder/_html5lib.py
rename to lib/bs4/builder/_html5lib.py
diff --git a/bs4/builder/_htmlparser.py b/lib/bs4/builder/_htmlparser.py
similarity index 100%
rename from bs4/builder/_htmlparser.py
rename to lib/bs4/builder/_htmlparser.py
diff --git a/bs4/builder/_lxml.py b/lib/bs4/builder/_lxml.py
similarity index 100%
rename from bs4/builder/_lxml.py
rename to lib/bs4/builder/_lxml.py
diff --git a/bs4/dammit.py b/lib/bs4/dammit.py
similarity index 100%
rename from bs4/dammit.py
rename to lib/bs4/dammit.py
diff --git a/bs4/diagnose.py b/lib/bs4/diagnose.py
similarity index 100%
rename from bs4/diagnose.py
rename to lib/bs4/diagnose.py
diff --git a/bs4/element.py b/lib/bs4/element.py
similarity index 100%
rename from bs4/element.py
rename to lib/bs4/element.py
diff --git a/bs4/formatter.py b/lib/bs4/formatter.py
similarity index 100%
rename from bs4/formatter.py
rename to lib/bs4/formatter.py
diff --git a/bs4/testing.py b/lib/bs4/testing.py
similarity index 100%
rename from bs4/testing.py
rename to lib/bs4/testing.py
diff --git a/bs4/tests/__init__.py b/lib/bs4/tests/__init__.py
similarity index 100%
rename from bs4/tests/__init__.py
rename to lib/bs4/tests/__init__.py
diff --git a/bs4/tests/test_builder_registry.py b/lib/bs4/tests/test_builder_registry.py
similarity index 100%
rename from bs4/tests/test_builder_registry.py
rename to lib/bs4/tests/test_builder_registry.py
diff --git a/bs4/tests/test_docs.py b/lib/bs4/tests/test_docs.py
similarity index 100%
rename from bs4/tests/test_docs.py
rename to lib/bs4/tests/test_docs.py
diff --git a/bs4/tests/test_html5lib.py b/lib/bs4/tests/test_html5lib.py
similarity index 100%
rename from bs4/tests/test_html5lib.py
rename to lib/bs4/tests/test_html5lib.py
diff --git a/bs4/tests/test_htmlparser.py b/lib/bs4/tests/test_htmlparser.py
similarity index 100%
rename from bs4/tests/test_htmlparser.py
rename to lib/bs4/tests/test_htmlparser.py
diff --git a/bs4/tests/test_lxml.py b/lib/bs4/tests/test_lxml.py
similarity index 100%
rename from bs4/tests/test_lxml.py
rename to lib/bs4/tests/test_lxml.py
diff --git a/bs4/tests/test_soup.py b/lib/bs4/tests/test_soup.py
similarity index 100%
rename from bs4/tests/test_soup.py
rename to lib/bs4/tests/test_soup.py
diff --git a/bs4/tests/test_tree.py b/lib/bs4/tests/test_tree.py
similarity index 100%
rename from bs4/tests/test_tree.py
rename to lib/bs4/tests/test_tree.py
diff --git a/soupsieve/__init__.py b/lib/soupsieve/__init__.py
similarity index 100%
rename from soupsieve/__init__.py
rename to lib/soupsieve/__init__.py
diff --git a/soupsieve/__meta__.py b/lib/soupsieve/__meta__.py
similarity index 100%
rename from soupsieve/__meta__.py
rename to lib/soupsieve/__meta__.py
diff --git a/soupsieve/css_match.py b/lib/soupsieve/css_match.py
similarity index 100%
rename from soupsieve/css_match.py
rename to lib/soupsieve/css_match.py
diff --git a/soupsieve/css_parser.py b/lib/soupsieve/css_parser.py
similarity index 100%
rename from soupsieve/css_parser.py
rename to lib/soupsieve/css_parser.py
diff --git a/soupsieve/css_types.py b/lib/soupsieve/css_types.py
similarity index 100%
rename from soupsieve/css_types.py
rename to lib/soupsieve/css_types.py
diff --git a/soupsieve/util.py b/lib/soupsieve/util.py
similarity index 100%
rename from soupsieve/util.py
rename to lib/soupsieve/util.py
diff --git a/markdown2html.py b/markdown2html.py
index 2ef3cb8..9b2efdd 100644
--- a/markdown2html.py
+++ b/markdown2html.py
@@ -1,3 +1,12 @@
+import sys
+import os
+
+# Add the 'lib' directory to the Python path BEFORE any other imports
+# This ensures bundled libraries are used
+lib_path = os.path.join(os.path.dirname(__file__), 'lib')
+if lib_path not in sys.path:
+    sys.path.insert(0, lib_path)
+
 """ Notice how this file is completely independent of sublime text
 
 I think it should be kept this way, just because it gives a bit more organisation,