diff --git a/Makefile b/Makefile
index 29b4622..b8c9e35 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ s3_buckets := $(BUCKET_PREFIX)
 
 TOPTARGETS := all clean package build
 
-SUBDIRS := $(wildcard functions/source/*/.)
-ZIP_SUBDIRS := $(wildcard functions/packages/*/.)
+SUBDIRS := $(wildcard lambda_functions/source/*/.)
+ZIP_SUBDIRS := $(wildcard lambda_functions/packages/*/.)
 
 ZIP_FILES := $(shell find $(ZIP_SUBDIRS) -type f -name '*.zip')
 
diff --git a/functions/packages/account/LaceworkCTAccount.zip b/lambda_functions/packages/account/LaceworkCTAccount.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount.zip
rename to lambda_functions/packages/account/LaceworkCTAccount.zip
diff --git a/functions/packages/account/LaceworkCTAccount1.4.1.zip b/lambda_functions/packages/account/LaceworkCTAccount1.4.1.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount1.4.1.zip
rename to lambda_functions/packages/account/LaceworkCTAccount1.4.1.zip
diff --git a/functions/packages/account/LaceworkCTAccount1.4.2.zip b/lambda_functions/packages/account/LaceworkCTAccount1.4.2.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount1.4.2.zip
rename to lambda_functions/packages/account/LaceworkCTAccount1.4.2.zip
diff --git a/functions/packages/account/LaceworkCTAccount1.4.3.zip b/lambda_functions/packages/account/LaceworkCTAccount1.4.3.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount1.4.3.zip
rename to lambda_functions/packages/account/LaceworkCTAccount1.4.3.zip
diff --git a/functions/packages/account/LaceworkCTAccount1.4.4.zip b/lambda_functions/packages/account/LaceworkCTAccount1.4.4.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount1.4.4.zip
rename to lambda_functions/packages/account/LaceworkCTAccount1.4.4.zip
diff --git a/functions/packages/account/LaceworkCTAccount1.4.5.zip b/lambda_functions/packages/account/LaceworkCTAccount1.4.5.zip
similarity index 100%
rename from functions/packages/account/LaceworkCTAccount1.4.5.zip
rename to lambda_functions/packages/account/LaceworkCTAccount1.4.5.zip
diff --git a/functions/packages/auth/LaceworkCTAuth.zip b/lambda_functions/packages/account/LaceworkCTAccount3.0.0.zip
similarity index 60%
rename from functions/packages/auth/LaceworkCTAuth.zip
rename to lambda_functions/packages/account/LaceworkCTAccount3.0.0.zip
index 14d68b0..33741b3 100644
Binary files a/functions/packages/auth/LaceworkCTAuth.zip and b/lambda_functions/packages/account/LaceworkCTAccount3.0.0.zip differ
diff --git a/functions/packages/setup/LaceworkCTSetup3.0.0.zip b/lambda_functions/packages/auth/LaceworkCTAuth.zip
similarity index 61%
rename from functions/packages/setup/LaceworkCTSetup3.0.0.zip
rename to lambda_functions/packages/auth/LaceworkCTAuth.zip
index 3bf724f..83604be 100644
Binary files a/functions/packages/setup/LaceworkCTSetup3.0.0.zip and b/lambda_functions/packages/auth/LaceworkCTAuth.zip differ
diff --git a/functions/packages/setup/LaceworkCTSetup.zip b/lambda_functions/packages/setup/LaceworkCTSetup.zip
similarity index 100%
rename from functions/packages/setup/LaceworkCTSetup.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup.zip
diff --git a/functions/packages/setup/LaceworkCTSetup1.4.3.zip b/lambda_functions/packages/setup/LaceworkCTSetup1.4.3.zip
similarity index 100%
rename from functions/packages/setup/LaceworkCTSetup1.4.3.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup1.4.3.zip
diff --git a/functions/packages/setup/LaceworkCTSetup1.4.4.zip b/lambda_functions/packages/setup/LaceworkCTSetup1.4.4.zip
similarity index 100%
rename from functions/packages/setup/LaceworkCTSetup1.4.4.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup1.4.4.zip
diff --git a/functions/packages/setup/LaceworkCTSetup1.4.5.zip b/lambda_functions/packages/setup/LaceworkCTSetup1.4.5.zip
similarity index 100%
rename from functions/packages/setup/LaceworkCTSetup1.4.5.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup1.4.5.zip
diff --git a/functions/packages/setup/LaceworkCTSetup1.4.6.zip b/lambda_functions/packages/setup/LaceworkCTSetup1.4.6.zip
similarity index 100%
rename from functions/packages/setup/LaceworkCTSetup1.4.6.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup1.4.6.zip
diff --git a/functions/packages/account/LaceworkCTAccount3.0.0.zip b/lambda_functions/packages/setup/LaceworkCTSetup3.0.0.zip
similarity index 61%
rename from functions/packages/account/LaceworkCTAccount3.0.0.zip
rename to lambda_functions/packages/setup/LaceworkCTSetup3.0.0.zip
index 5cde244..01a75e6 100644
Binary files a/functions/packages/account/LaceworkCTAccount3.0.0.zip and b/lambda_functions/packages/setup/LaceworkCTSetup3.0.0.zip differ
diff --git a/functions/source/account/Makefile b/lambda_functions/source/account/Makefile
similarity index 100%
rename from functions/source/account/Makefile
rename to lambda_functions/source/account/Makefile
diff --git a/functions/source/account/account.py b/lambda_functions/source/account/account.py
similarity index 100%
rename from functions/source/account/account.py
rename to lambda_functions/source/account/account.py
diff --git a/functions/source/account/requirements.txt b/lambda_functions/source/account/requirements.txt
similarity index 100%
rename from functions/source/account/requirements.txt
rename to lambda_functions/source/account/requirements.txt
diff --git a/functions/source/auth/Makefile b/lambda_functions/source/auth/Makefile
similarity index 100%
rename from functions/source/auth/Makefile
rename to lambda_functions/source/auth/Makefile
diff --git a/functions/source/auth/auth.py b/lambda_functions/source/auth/auth.py
similarity index 100%
rename from functions/source/auth/auth.py
rename to lambda_functions/source/auth/auth.py
diff --git a/functions/source/auth/requirements.txt b/lambda_functions/source/auth/requirements.txt
similarity index 100%
rename from functions/source/auth/requirements.txt
rename to lambda_functions/source/auth/requirements.txt
diff --git a/functions/source/common/Makefile b/lambda_functions/source/common/Makefile
similarity index 100%
rename from functions/source/common/Makefile
rename to lambda_functions/source/common/Makefile
diff --git a/functions/source/common/__init__.py b/lambda_functions/source/common/__init__.py
similarity index 100%
rename from functions/source/common/__init__.py
rename to lambda_functions/source/common/__init__.py
diff --git a/functions/source/common/aws.py b/lambda_functions/source/common/aws.py
similarity index 100%
rename from functions/source/common/aws.py
rename to lambda_functions/source/common/aws.py
diff --git a/functions/source/common/honeycomb.py b/lambda_functions/source/common/honeycomb.py
similarity index 85%
rename from functions/source/common/honeycomb.py
rename to lambda_functions/source/common/honeycomb.py
index f9aa77b..8ee0899 100644
--- a/functions/source/common/honeycomb.py
+++ b/lambda_functions/source/common/honeycomb.py
@@ -28,9 +28,9 @@ def send_honeycomb_event(honey_key, dataset, version, account, event, subaccount
         '''.format(account, subaccount, version, event, eventdata)
         logger.info('Generate payload : {}'.format(payload))
         resp = requests.post("https://api.honeycomb.io/1/events/" + dataset,
-                             headers={'X-Honeycomb-Team': honey_key,
-                                      'content-type': 'application/json'},
-                             verify=True, data=payload)
+                         headers={'X-Honeycomb-Team': honey_key,
+                                  'content-type': 'application/json'},
+                         verify=True, data=payload)
         logger.info("Honeycomb response {} {}".format(resp, resp.content))
 
     except Exception as e:
diff --git a/functions/source/common/lacework.py b/lambda_functions/source/common/lacework.py
similarity index 100%
rename from functions/source/common/lacework.py
rename to lambda_functions/source/common/lacework.py
diff --git a/functions/source/common/util.py b/lambda_functions/source/common/util.py
similarity index 100%
rename from functions/source/common/util.py
rename to lambda_functions/source/common/util.py
diff --git a/functions/source/setup/Makefile b/lambda_functions/source/setup/Makefile
similarity index 100%
rename from functions/source/setup/Makefile
rename to lambda_functions/source/setup/Makefile
diff --git a/functions/source/setup/requirements.txt b/lambda_functions/source/setup/requirements.txt
similarity index 100%
rename from functions/source/setup/requirements.txt
rename to lambda_functions/source/setup/requirements.txt
diff --git a/functions/source/setup/setup.py b/lambda_functions/source/setup/setup.py
similarity index 100%
rename from functions/source/setup/setup.py
rename to lambda_functions/source/setup/setup.py