diff --git a/cdn_lambda/functions/__init__.py b/cdn_lambda/functions/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cdn_lambda/lambda_functions.py b/cdn_lambda/functions/not_implemented.py
similarity index 100%
rename from cdn_lambda/lambda_functions.py
rename to cdn_lambda/functions/not_implemented.py
diff --git a/tests/test_lambda.py b/tests/functions/test_not_implemented.py
similarity index 56%
rename from tests/test_lambda.py
rename to tests/functions/test_not_implemented.py
index e359ea5d..3a994a02 100644
--- a/tests/test_lambda.py
+++ b/tests/functions/test_not_implemented.py
@@ -1,4 +1,4 @@
-from cdn_lambda.lambda_functions import lambda_handler
+from cdn_lambda.functions.not_implemented import lambda_handler
 
 
 def test_lambda_handler():