diff --git a/lib/codegen.py b/lib/bb/codegen.py
similarity index 100%
rename from lib/codegen.py
rename to lib/bb/codegen.py
diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py
index 4f70cf7f..76e4eea2 100644
--- a/lib/bb/codeparser.py
+++ b/lib/bb/codeparser.py
@@ -25,9 +25,9 @@ recipe caches don't trigger "Taskhash mismatch" errors.
 
 import ast
 import sys
-import codegen
 import logging
 import inspect
+import bb.codegen
 import bb.pysh as pysh
 import bb.utils, bb.data
 import hashlib