diff --git a/tools/munger/Makefile b/tools/munger/Makefile
index 43f02e2..4e979d2 100644
--- a/tools/munger/Makefile
+++ b/tools/munger/Makefile
@@ -10,7 +10,7 @@
 
 PYLIBOF_DIR = ${TOOLS_DIR}/pylibopenflow
 
-TARGET_DIR = ${TOP_DIR}/src/python/oftest/protocol
+TARGET_DIR = ${TOP_DIR}/src/python/oftest
 
 # Relative to pyopenflow-pythonize exec location
 OF_HEADER = include/openflow.h
@@ -49,6 +49,7 @@
 	mkdir -p lint
 	(cd ${TARGET_DIR} && pylint -e $(notdir $<)) > $@
 
+# Note that lint has issues with scapy syntax
 lint: ${LINT_FILES}
 
 # For now. just local source doc generated
diff --git a/tools/munger/scripts/action_gen.py b/tools/munger/scripts/action_gen.py
index 6f9d11a..8746faf 100644
--- a/tools/munger/scripts/action_gen.py
+++ b/tools/munger/scripts/action_gen.py
@@ -5,7 +5,7 @@
 
 import re
 import sys
-sys.path.append("../../src/python/oftest/protocol")
+sys.path.append("../../src/python/oftest")
 from cstruct import *
 from class_maps import class_to_members_map
 
diff --git a/tools/munger/scripts/error_gen.py b/tools/munger/scripts/error_gen.py
index e1c8ce7..7ee2d35 100644
--- a/tools/munger/scripts/error_gen.py
+++ b/tools/munger/scripts/error_gen.py
@@ -5,7 +5,7 @@
 
 import re
 import sys
-sys.path.append("../../src/python/oftest/protocol")
+sys.path.append("../../src/python/oftest")
 from cstruct import *
 from class_maps import class_to_members_map
 
diff --git a/tools/munger/scripts/message_gen.py b/tools/munger/scripts/message_gen.py
index 2a9f963..31665ca 100644
--- a/tools/munger/scripts/message_gen.py
+++ b/tools/munger/scripts/message_gen.py
@@ -80,7 +80,7 @@
 import re
 import string
 import sys
-sys.path.append("../../src/python/oftest/protocol")
+sys.path.append("../../src/python/oftest")
 from cstruct import *
 from class_maps import class_to_members_map
 
diff --git a/tools/munger/tests/msg_test.py b/tools/munger/tests/msg_test.py
index 720c608..e816cc1 100644
--- a/tools/munger/tests/msg_test.py
+++ b/tools/munger/tests/msg_test.py
@@ -1,5 +1,5 @@
 import sys
-sys.path.append('../../../src/python/oftest/protocol')
+sys.path.append('../../../src/python/oftest')
 
 from parse import of_message_parse
 from parse import of_header_parse