diff --git a/mythx_cli/fuzz/brownie.py b/mythx_cli/fuzz/brownie.py
new file mode 100644
index 0000000..3189b68
--- /dev/null
+++ b/mythx_cli/fuzz/brownie.py
@@ -0,0 +1,73 @@
+from pathlib import Path
+import json
+import os
+
+
+class BrownieJob():
+    def __init__(self, target: Path):
+        self.target = target
+        self.contracts = []
+        self.sources = {}
+        self.build_files, self.build_files_by_source_file = self.find_brownie_artifacts()
+        self.payload = {}
+
+    def find_brownie_artifacts(self):
+        build_files = {}
+        build_files_by_source_file = {}
+        build_dir = os.walk('build/contracts')
+
+        for sub_dir in build_dir:
+            if len(sub_dir[2]) > 0:
+                # sub directory with .json files
+                file_prefix = sub_dir[0]
+                for file in sub_dir[2]:
+                    file_name = file_prefix + "/" + file
+                    with open(file_name) as json_file:
+                        # load the build artifact
+                        data = json.load(json_file)
+                        # store it on a dictionary by file name
+                        build_files[file_name] = data
+                        source_path = data["sourcePath"]
+                        # store it on a dictionary by source file name
+                        if source_path not in build_files_by_source_file:
+                            # initialize the array of contracts with a list
+                            build_files_by_source_file[source_path] = []
+                        build_files_by_source_file[source_path].append(data)
+        return build_files, build_files_by_source_file
+
+    def generate_payload(self, execution):
+        for t in self.target:
+            smart_contracts = self.build_files_by_source_file[t]
+            for contract in smart_contracts:
+                faas_contract_item = {}
+                faas_contract_item["sourcePaths"] = contract["allSourcePaths"]
+                faas_contract_item["deployedSourceMap"] = contract["deployedSourceMap"]
+                faas_contract_item["deployedBytecode"] = contract["deployedBytecode"]
+                faas_contract_item["sourceMap"] = contract["sourceMap"]
+                faas_contract_item["bytecode"] = contract["bytecode"]
+                faas_contract_item["contractName"] = contract["contractName"]
+                faas_contract_item["mainSourceFile"] = contract["sourcePath"]
+
+                for file_index, source_file in contract["allSourcePaths"].items():
+                    if source_file in self.sources:
+                        # print("File already included, skipping")
+                        continue
+                    faas_source_item = {}
+                    faas_source_item["fileIndex"] = file_index
+                    if source_file not in self.build_files_by_source_file:
+                        # print(str(source_file)+ " not available")
+                        continue
+
+                    # We can select any dict on the build_files_by_source_file[source_file] array
+                    # because the .source and .ast values will be the same in all.
+                    target_file = self.build_files_by_source_file[source_file][0]
+                    faas_source_item["source"] = target_file["source"]
+                    faas_source_item["ast"] = target_file["ast"]
+                    self.sources[source_file] = faas_source_item
+
+            self.contracts.append(faas_contract_item)
+        self.payload = {
+            "execution": execution,
+            "contracts": self.contracts,
+            "sources": self.sources
+        }
diff --git a/mythx_cli/fuzz/run.py b/mythx_cli/fuzz/run.py
index a34c5a0..d2f4d25 100644
--- a/mythx_cli/fuzz/run.py
+++ b/mythx_cli/fuzz/run.py
@@ -1,8 +1,10 @@
 import logging
+import os
+
 import requests
 import click
-from mythx_cli.analyze.solidity import SolidityJob
 import json
+from .brownie import  BrownieJob
 
 LOGGER = logging.getLogger("mythx-cli")
 
@@ -14,7 +16,6 @@
 
 time_limit_seconds = 3000
 
-
 def rpc_call(method: str, params: str):
     payload = "{\"jsonrpc\":\"2.0\",\"method\":\"" + method + "\",\"params\":" + params + ",\"id\":1}"
     response = (requests.request("POST", rpc_url, headers=headers, data=payload)).json()
@@ -67,17 +68,6 @@ def get_seed_state(address: str, other_addresses: [str]):
         }
     )
 
-
-def camel_case_payload(payload):
-    payload["mainSource"] = payload.pop("main_source")
-    payload["solcVersion"] = payload.pop("solc_version")
-    payload["contractName"] = payload.pop("contract_name")
-    payload["sourceMap"] = payload.pop("source_map")
-    payload["sourceList"] = payload.pop("source_list")
-    payload["deployedBytecode"] = payload.pop("deployed_bytecode")
-    payload["deployedSourceMap"] = payload.pop("deployed_source_map")
-
-
 @click.command("run")
 @click.option(
     "-a",
@@ -124,17 +114,12 @@ def fuzz_run(ctx, address, more_addresses, target):
         other_addresses = more_addresses.split(',')
 
     seed_state = get_seed_state(contract_address, other_addresses)
-    payloads = []
-    for t in target:
-        sol = SolidityJob(target=t)
-        sol.generate_payloads(version="0.6.12")
-        camel_case_payload(sol.payloads[0])
-        payloads.append(sol.payloads[0])
-
-    data = {
-        "execution": seed_state,
-        "input": payloads
-    }
-
-    print(json.dumps(data))
-    pass
+
+    # print(json.dumps(api_payload))
+    brownie = BrownieJob(target)
+    brownie.generate_payload(seed_state)
+
+    api_payload = brownie.payload
+    print(json.dumps(api_payload))
+
+pass