diff --git a/buildcollector.py b/buildcollector.py
index 7091197..8d84cfa 100644
--- a/buildcollector.py
+++ b/buildcollector.py
@@ -147,6 +147,7 @@
     """
     Write JSON file out to a path, creating directories in path as needed
     """
+    logger.debug("writing JSON file: %s", path)
 
     # create directory if it doesn't already exist
     parent_dir = os.path.dirname(path)
@@ -357,8 +358,9 @@
 
     product_data["groups"] = groups
 
-    product_filename = "%s/%s.json" % (
+    product_filename = "%s/%s/%s.json" % (
         product_dir,
+        product_doc["onf_project"],
         clean_name(product_doc["product_name"]),
     )