From: Josh <jrosenba@cisco.com>
Date: Wed, 16 Jul 2014 23:00:48 +0000 (-0400)
Subject: Snort2Lua finalized and Makefile support added
X-Git-Tag: 3.0.0-233~1175^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23a6cd8a08a389deaccec4c3d7e5c2c325ab9a8a;p=thirdparty%2Fsnort3.git

Snort2Lua finalized and Makefile support added
---

diff --git a/configure.ac b/configure.ac
index 6cbb1bc19..58ee79a89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -801,7 +801,7 @@ CXXFLAGS="$CFLAGS"
 echo "$AM_CFLAGS $CFLAGS" > cflags.out
 echo "$AM_CPPFLAGS $CPPFLAGS" > cppflags.out
 
-AM_CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/main -I$(top_srcdir)/src/parser -I$(top_srcdir)/src/utils -I$(top_srcdir)/src/loggers -I$(top_srcdir)/src/time -I$(top_srcdir)/src/protocols -I$(top_srcdir)/src/network_inspectors -I$(top_srcdir)/src/log -I$(top_srcdir)/src/events -I$(top_srcdir)/src/sfip -I$(top_srcdir)/src/detection -I$(top_srcdir)/src/hash' 
+AM_CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/main -I$(top_srcdir)/src/parser -I$(top_srcdir)/src/utils -I$(top_srcdir)/src/loggers -I$(top_srcdir)/src/time -I$(top_srcdir)/src/protocols -I$(top_srcdir)/src/network_inspectors -I$(top_srcdir)/src/log -I$(top_srcdir)/src/events -I$(top_srcdir)/src/sfip -I$(top_srcdir)/src/detection -I$(top_srcdir)/src/hash -I$(top_srcdir)/tools/snort2lua'
 
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
@@ -869,6 +869,14 @@ etc/Makefile \
 tools/Makefile \
 tools/u2boat/Makefile \
 tools/u2spewfoo/Makefile \
+tools/snort2lua/Makefile \
+tools/snort2lua/config_states/Makefile \
+tools/snort2lua/data/Makefile \
+tools/snort2lua/keyword_states/Makefile \
+tools/snort2lua/output_states/Makefile \
+tools/snort2lua/preprocessor_states/Makefile \
+tools/snort2lua/rule_states/Makefile \
+tools/snort2lua/utils/Makefile \
 ])
 
 AC_OUTPUT
diff --git a/src/codecs/link/cd_eapol_module.cc b/src/codecs/link/cd_eapol_module.cc
index 831918c8f..c6dbd946b 100644
--- a/src/codecs/link/cd_eapol_module.cc
+++ b/src/codecs/link/cd_eapol_module.cc
@@ -39,3 +39,5 @@ EapolModule::EapolModule() : DecodeModule(CD_EAPOL_NAME)
 const RuleMap* EapolModule::get_rules() const
 { return eapol_rules; }
 
+bool EapolModule::set(const char* /*fqn*/, Value& /*v*/, SnortConfig* /*sc*/)
+{ return true; }
diff --git a/src/codecs/root/cd_wlan_module.cc b/src/codecs/root/cd_wlan_module.cc
index ed9fa3fad..2dfbeb38e 100644
--- a/src/codecs/root/cd_wlan_module.cc
+++ b/src/codecs/root/cd_wlan_module.cc
@@ -38,3 +38,5 @@ WlanCodecModule::WlanCodecModule() : DecodeModule(CD_WLAN_NAME)
 const RuleMap* WlanCodecModule::get_rules() const
 { return wifi_rules; }
 
+bool WlanCodecModule::set(const char* /*fqn*/, Value& /*v*/, SnortConfig* /*sc*/)
+{ return true; }
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8b7c78cb..2ffabcb75 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
 
 SUBDIRS = \
 u2boat \
-u2spewfoo
+u2spewfoo \
+snort2lua
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/CMakeLists.txt b/tools/snort2lua/CMakeLists.txt
index 0bb2d9a30..d9aa3982f 100644
--- a/tools/snort2lua/CMakeLists.txt
+++ b/tools/snort2lua/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(preprocessor_states)
 add_subdirectory(output_states)
 add_subdirectory(config_states)
 add_subdirectory(rule_states)
-add_subdirectory(util)
+add_subdirectory(utils)
 
 if (BUILD_UNIT_TESTS)
 if (0)
@@ -26,7 +26,7 @@ add_executable( snort2lua
 
 target_link_libraries( snort2lua
     conversion_data
-    util
+    snort2lua_utils
     keyword_states
     output_states
     preprocessor_states
diff --git a/tools/snort2lua/Makefile.am b/tools/snort2lua/Makefile.am
new file mode 100644
index 000000000..03482866d
--- /dev/null
+++ b/tools/snort2lua/Makefile.am
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS=foreign  no-dependencies
+
+bin_PROGRAMS = snort2lua
+
+snort2lua_SOURCES = \
+conversion_state.h \
+option_parser.h \
+init_state.h \
+snort2lua.cc \
+init_state.cc
+
+snort2lua_LDADD = \
+utils/libsnort2lua_utils.a \
+data/libdata.a \
+keyword_states/libkeyword_states.a \
+preprocessor_states/libpreprocessor_states.a \
+output_states/liboutput_states.a \
+config_states/libconfig_states.a \
+rule_states/librule_states.a
+
+snort2lua_CFLAGS = @CFLAGS@ $(AM_CFLAGS)
+
+SUBDIRS = \
+utils \
+data \
+keyword_states \
+preprocessor_states \
+output_states \
+config_states \
+rule_states
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+
diff --git a/tools/snort2lua/config_states/Makefile.am b/tools/snort2lua/config_states/Makefile.am
new file mode 100644
index 000000000..e031fd078
--- /dev/null
+++ b/tools/snort2lua/config_states/Makefile.am
@@ -0,0 +1,35 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libconfig_states.a
+
+libconfig_states_a_SOURCES = \
+config_binding.cc \
+config_checksums.cc \
+config_classification.cc \
+config_decode_esp.cc \
+config_default_rule_state.cc \
+config_deleted.cc \
+config_detection.cc \
+config_event_trace.cc \
+config_file.cc \
+config_event_queue.cc \
+config_ignore_ports.cc \
+config_ipv6_frag.cc \
+config_memcaps.cc \
+config_mpls_payload_type.cc \
+config_no_option.cc \
+config_one_int_option.cc \
+config_one_string_option.cc \
+config_order.cc \
+config_ppm.cc \
+config_profile.cc \
+config_reference.cc \
+config_response.cc \
+config_tunnel_verdicts.cc \
+config_api.h \
+config_api.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+
diff --git a/tools/snort2lua/config_states/config_api.cc b/tools/snort2lua/config_states/config_api.cc
index 25e969aec..4d0ed85fc 100644
--- a/tools/snort2lua/config_states/config_api.cc
+++ b/tools/snort2lua/config_states/config_api.cc
@@ -102,7 +102,7 @@ extern const ConvertMap* mpls_payload_type_map;
 extern const ConvertMap* min_ttl_map;
 extern const ConvertMap* new_ttl_map;
 extern const ConvertMap* nolog_map;
-extern const ConvertMap* nopcre_map;;
+extern const ConvertMap* nopcre_map;
 extern const ConvertMap* no_promisc_map;
 extern const ConvertMap* obfuscate_map;
 extern const ConvertMap* order_map;
diff --git a/tools/snort2lua/config_states/config_binding.cc b/tools/snort2lua/config_states/config_binding.cc
index ad989e875..fae9880af 100644
--- a/tools/snort2lua/config_states/config_binding.cc
+++ b/tools/snort2lua/config_states/config_binding.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_checksums.cc b/tools/snort2lua/config_states/config_checksums.cc
index 066c4d4eb..e95fa4193 100644
--- a/tools/snort2lua/config_states/config_checksums.cc
+++ b/tools/snort2lua/config_states/config_checksums.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_classification.cc b/tools/snort2lua/config_states/config_classification.cc
index 3ebdc54d5..b1be84fbf 100644
--- a/tools/snort2lua/config_states/config_classification.cc
+++ b/tools/snort2lua/config_states/config_classification.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_decode_esp.cc b/tools/snort2lua/config_states/config_decode_esp.cc
index 5c798004d..ae8bf1802 100644
--- a/tools/snort2lua/config_states/config_decode_esp.cc
+++ b/tools/snort2lua/config_states/config_decode_esp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_default_rule_state.cc b/tools/snort2lua/config_states/config_default_rule_state.cc
index a42084fd4..9d50cf9e3 100644
--- a/tools/snort2lua/config_states/config_default_rule_state.cc
+++ b/tools/snort2lua/config_states/config_default_rule_state.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_deleted.cc b/tools/snort2lua/config_states/config_deleted.cc
index 1d96f23f5..1035defc4 100644
--- a/tools/snort2lua/config_states/config_deleted.cc
+++ b/tools/snort2lua/config_states/config_deleted.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -56,7 +56,7 @@ static ConversionState* deleted_ctor(Converter* cv, LuaData* ld)
     if (!ld->is_quiet_mode())
     {
         ld->open_table("deleted_snort_config_options");
-        ld->add_deprecated_comment("config " + *snort_option + "[:.*]");
+        ld->add_deleted_comment("config " + *snort_option + "[:.*]");
         ld->close_table();
     }
 
diff --git a/tools/snort2lua/config_states/config_detection.cc b/tools/snort2lua/config_states/config_detection.cc
index 6452f69ca..56141900a 100644
--- a/tools/snort2lua/config_states/config_detection.cc
+++ b/tools/snort2lua/config_states/config_detection.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -197,7 +197,7 @@ bool Detection::convert(std::istringstream& data_stream)
                 new_method = "lowmem";
 
             else if (!method.compare("mwm"))
-                ld->add_deprecated_comment("mwm");
+                ld->add_deleted_comment("mwm");
 
             else if (!method.compare("ac-split"))
             {
diff --git a/tools/snort2lua/config_states/config_event_queue.cc b/tools/snort2lua/config_states/config_event_queue.cc
index b5d80e92e..54fe53f67 100644
--- a/tools/snort2lua/config_states/config_event_queue.cc
+++ b/tools/snort2lua/config_states/config_event_queue.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_event_trace.cc b/tools/snort2lua/config_states/config_event_trace.cc
index ee971002d..eacbd3de5 100644
--- a/tools/snort2lua/config_states/config_event_trace.cc
+++ b/tools/snort2lua/config_states/config_event_trace.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_file.cc b/tools/snort2lua/config_states/config_file.cc
index ca9a164c6..5a9f81333 100644
--- a/tools/snort2lua/config_states/config_file.cc
+++ b/tools/snort2lua/config_states/config_file.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_ignore_ports.cc b/tools/snort2lua/config_states/config_ignore_ports.cc
index 8a546a1c2..8ab55d50f 100644
--- a/tools/snort2lua/config_states/config_ignore_ports.cc
+++ b/tools/snort2lua/config_states/config_ignore_ports.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_ipv6_frag.cc b/tools/snort2lua/config_states/config_ipv6_frag.cc
index 0cdcfed7a..30d40fd5c 100644
--- a/tools/snort2lua/config_states/config_ipv6_frag.cc
+++ b/tools/snort2lua/config_states/config_ipv6_frag.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
@@ -48,7 +48,7 @@ void Ipv6Frag::add_deleted_option(std::string dlt_opt)
 {
     // see comment in Ipv6Frag::convert
     if (!ld->is_quiet_mode())
-        ld->add_deprecated_comment("config ipv6_frag: " + dlt_opt);
+        ld->add_deleted_comment("config ipv6_frag: " + dlt_opt);
 }
 
 bool Ipv6Frag::convert(std::istringstream& data_stream)
diff --git a/tools/snort2lua/config_states/config_memcaps.cc b/tools/snort2lua/config_states/config_memcaps.cc
index 65b68910a..622ee29a5 100644
--- a/tools/snort2lua/config_states/config_memcaps.cc
+++ b/tools/snort2lua/config_states/config_memcaps.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_mpls_payload_type.cc b/tools/snort2lua/config_states/config_mpls_payload_type.cc
index a0d53f24c..65de78570 100644
--- a/tools/snort2lua/config_states/config_mpls_payload_type.cc
+++ b/tools/snort2lua/config_states/config_mpls_payload_type.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_no_option.cc b/tools/snort2lua/config_states/config_no_option.cc
index ebbcd1521..b4a21a1cd 100644
--- a/tools/snort2lua/config_states/config_no_option.cc
+++ b/tools/snort2lua/config_states/config_no_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_one_int_option.cc b/tools/snort2lua/config_states/config_one_int_option.cc
index 55064d083..aaa29041b 100644
--- a/tools/snort2lua/config_states/config_one_int_option.cc
+++ b/tools/snort2lua/config_states/config_one_int_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_one_string_option.cc b/tools/snort2lua/config_states/config_one_string_option.cc
index fa18bc46a..fe193307e 100644
--- a/tools/snort2lua/config_states/config_one_string_option.cc
+++ b/tools/snort2lua/config_states/config_one_string_option.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_order.cc b/tools/snort2lua/config_states/config_order.cc
index 256350fbb..5769f33fe 100644
--- a/tools/snort2lua/config_states/config_order.cc
+++ b/tools/snort2lua/config_states/config_order.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_ppm.cc b/tools/snort2lua/config_states/config_ppm.cc
index f1e967578..1a7c7d722 100644
--- a/tools/snort2lua/config_states/config_ppm.cc
+++ b/tools/snort2lua/config_states/config_ppm.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_profile.cc b/tools/snort2lua/config_states/config_profile.cc
index fac8c0610..258725319 100644
--- a/tools/snort2lua/config_states/config_profile.cc
+++ b/tools/snort2lua/config_states/config_profile.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_reference.cc b/tools/snort2lua/config_states/config_reference.cc
index bff84c0b8..b8bcc0971 100644
--- a/tools/snort2lua/config_states/config_reference.cc
+++ b/tools/snort2lua/config_states/config_reference.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_response.cc b/tools/snort2lua/config_states/config_response.cc
index 1460e3e01..c5ca39d0a 100644
--- a/tools/snort2lua/config_states/config_response.cc
+++ b/tools/snort2lua/config_states/config_response.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/config_states/config_tunnel_verdicts.cc b/tools/snort2lua/config_states/config_tunnel_verdicts.cc
index e8e41cc9c..7bba5d760 100644
--- a/tools/snort2lua/config_states/config_tunnel_verdicts.cc
+++ b/tools/snort2lua/config_states/config_tunnel_verdicts.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace config
 {
diff --git a/tools/snort2lua/conversion_state.h b/tools/snort2lua/conversion_state.h
index e3d7baa1a..9b46ea550 100644
--- a/tools/snort2lua/conversion_state.h
+++ b/tools/snort2lua/conversion_state.h
@@ -30,9 +30,9 @@
 #include "data/dt_data.h"
 
 // the following three files are for the function 'set_next_rule_state'
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "rule_states/rule_api.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 
 class Converter;
 class ConversionState;
@@ -244,7 +244,7 @@ protected:
                                         bool required = true)
     {
         std::string val;
-        ld->add_deprecated_comment(opt_name);
+        ld->add_deleted_comment(opt_name);
 
         if(stream >> val)
             return true;
diff --git a/tools/snort2lua/data/Makefile.am b/tools/snort2lua/data/Makefile.am
new file mode 100644
index 000000000..08d411db2
--- /dev/null
+++ b/tools/snort2lua/data/Makefile.am
@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libdata.a
+
+libdata_a_SOURCES = \
+dt_comment.h \
+dt_comment.cc \
+dt_data.h \
+dt_data.cc \
+dt_include.h \
+dt_include.cc \
+dt_option.h \
+dt_option.cc \
+dt_table.h \
+dt_table.cc \
+dt_rule.h \
+dt_rule.cc \
+dt_rule_option.h \
+dt_rule_option.cc \
+dt_rule_suboption.h \
+dt_rule_suboption.cc \
+dt_var.h \
+dt_var.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/data/dt_comment.cc b/tools/snort2lua/data/dt_comment.cc
index 64956069c..b5bd61e2d 100644
--- a/tools/snort2lua/data/dt_comment.cc
+++ b/tools/snort2lua/data/dt_comment.cc
@@ -20,7 +20,7 @@
 // dt_comment.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "data/dt_comment.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 Comments::Comments(CommentType type)
 {
diff --git a/tools/snort2lua/data/dt_data.cc b/tools/snort2lua/data/dt_data.cc
index 43c4b120b..08cb14591 100644
--- a/tools/snort2lua/data/dt_data.cc
+++ b/tools/snort2lua/data/dt_data.cc
@@ -20,7 +20,7 @@
 // dt_data.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "dt_data.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include <iostream>
 #include <sstream>
 
@@ -292,7 +292,7 @@ bool LuaData::add_diff_option_comment(std::string orig_var, std::string new_var)
 }
 
 
-bool LuaData::add_deprecated_comment(std::string dep_var)
+bool LuaData::add_deleted_comment(std::string dep_var)
 {
     std::string error_string = "option deleted: '" + dep_var + "'";
 
diff --git a/tools/snort2lua/data/dt_data.h b/tools/snort2lua/data/dt_data.h
index 20ccacec9..293ce6317 100644
--- a/tools/snort2lua/data/dt_data.h
+++ b/tools/snort2lua/data/dt_data.h
@@ -111,7 +111,7 @@ public:
     // add a comment about an option change to the table
     bool add_diff_option_comment(std::string orig_var, std::string new_var);
     // attach a deprecated option comment to the current table
-    bool add_deprecated_comment(std::string dep_var);
+    bool add_deleted_comment(std::string dep_var);
     // attach an unsupported option comment to the current table
     bool add_unsupported_comment(std::string unsupported_var);
 
diff --git a/tools/snort2lua/data/dt_rule.cc b/tools/snort2lua/data/dt_rule.cc
index 72b113890..e0dee77bf 100644
--- a/tools/snort2lua/data/dt_rule.cc
+++ b/tools/snort2lua/data/dt_rule.cc
@@ -22,7 +22,7 @@
 
 #include "data/dt_rule.h"
 #include "data/dt_data.h"  // included for print mode
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 
 Rule::Rule() :  num_hdr_data(0),
@@ -31,7 +31,7 @@ Rule::Rule() :  num_hdr_data(0),
 {
 }
 
-Rule::~Rule(){};
+Rule::~Rule(){}
 
 
 bool Rule::add_hdr_data(std::string data)
diff --git a/tools/snort2lua/data/dt_var.cc b/tools/snort2lua/data/dt_var.cc
index 660c34af8..883ab6b7b 100644
--- a/tools/snort2lua/data/dt_var.cc
+++ b/tools/snort2lua/data/dt_var.cc
@@ -20,7 +20,7 @@
 // dt_var.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include "data/dt_var.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 Variable::Variable(std::string name, int depth)
 {
@@ -34,7 +34,7 @@ Variable::Variable(std::string name)
     this->depth = 0;
 }
 
-Variable::~Variable(){};
+Variable::~Variable(){}
 
 // does this need a new variable?
 bool Variable::add_value(std::string elem)
diff --git a/tools/snort2lua/init_state.cc b/tools/snort2lua/init_state.cc
index b45fbd5fb..372a972b5 100644
--- a/tools/snort2lua/init_state.cc
+++ b/tools/snort2lua/init_state.cc
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <string>
 #include "init_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "keyword_states/keywords_api.h"
 
 
diff --git a/tools/snort2lua/init_state.h b/tools/snort2lua/init_state.h
index 5bd859733..f5bb03ece 100644
--- a/tools/snort2lua/init_state.h
+++ b/tools/snort2lua/init_state.h
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <fstream>
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 
 #ifndef INIT_STATE_H
 #define INIT_STATE_H
diff --git a/tools/snort2lua/keyword_states/Makefile.am b/tools/snort2lua/keyword_states/Makefile.am
new file mode 100644
index 000000000..515526c24
--- /dev/null
+++ b/tools/snort2lua/keyword_states/Makefile.am
@@ -0,0 +1,22 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libkeyword_states.a
+
+libkeyword_states_a_SOURCES = \
+kws_config.cc \
+kws_event_filter.cc \
+kws_file.cc \
+kws_include.cc \
+kws_output.cc \
+kws_paths.cc \
+kws_preprocessor.cc \
+kws_rule.cc \
+kws_rule_state.cc \
+kws_rate_filter.cc \
+kws_var.cc \
+kws_suppress.cc \
+keywords_api.h \
+keywords_api.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/keyword_states/kws_config.cc b/tools/snort2lua/keyword_states/kws_config.cc
index ed651b324..e42d8ac88 100644
--- a/tools/snort2lua/keyword_states/kws_config.cc
+++ b/tools/snort2lua/keyword_states/kws_config.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "config_states/config_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {
diff --git a/tools/snort2lua/keyword_states/kws_event_filter.cc b/tools/snort2lua/keyword_states/kws_event_filter.cc
index c6967405c..b42ad85ba 100644
--- a/tools/snort2lua/keyword_states/kws_event_filter.cc
+++ b/tools/snort2lua/keyword_states/kws_event_filter.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {
diff --git a/tools/snort2lua/keyword_states/kws_file.cc b/tools/snort2lua/keyword_states/kws_file.cc
index e49c3c916..de5d2aefa 100644
--- a/tools/snort2lua/keyword_states/kws_file.cc
+++ b/tools/snort2lua/keyword_states/kws_file.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords
diff --git a/tools/snort2lua/keyword_states/kws_include.cc b/tools/snort2lua/keyword_states/kws_include.cc
index 6a309a331..6e6f26c3c 100644
--- a/tools/snort2lua/keyword_states/kws_include.cc
+++ b/tools/snort2lua/keyword_states/kws_include.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {
diff --git a/tools/snort2lua/keyword_states/kws_output.cc b/tools/snort2lua/keyword_states/kws_output.cc
index ca103547b..dd8554216 100644
--- a/tools/snort2lua/keyword_states/kws_output.cc
+++ b/tools/snort2lua/keyword_states/kws_output.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "output_states/output_api.h"
 
 namespace keywords
diff --git a/tools/snort2lua/keyword_states/kws_paths.cc b/tools/snort2lua/keyword_states/kws_paths.cc
index ae8ab69de..c06e2f96e 100644
--- a/tools/snort2lua/keyword_states/kws_paths.cc
+++ b/tools/snort2lua/keyword_states/kws_paths.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords
diff --git a/tools/snort2lua/keyword_states/kws_preprocessor.cc b/tools/snort2lua/keyword_states/kws_preprocessor.cc
index 1f53b86e5..e96daf1e9 100644
--- a/tools/snort2lua/keyword_states/kws_preprocessor.cc
+++ b/tools/snort2lua/keyword_states/kws_preprocessor.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "preprocessor_states/preprocessor_api.h"
 
 
diff --git a/tools/snort2lua/keyword_states/kws_rate_filter.cc b/tools/snort2lua/keyword_states/kws_rate_filter.cc
index 2f7d645c0..47333dbc4 100644
--- a/tools/snort2lua/keyword_states/kws_rate_filter.cc
+++ b/tools/snort2lua/keyword_states/kws_rate_filter.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords
diff --git a/tools/snort2lua/keyword_states/kws_rule.cc b/tools/snort2lua/keyword_states/kws_rule.cc
index c4d09ed62..39777ad5a 100644
--- a/tools/snort2lua/keyword_states/kws_rule.cc
+++ b/tools/snort2lua/keyword_states/kws_rule.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 #include "rule_states/rule_api.h"
 
 
diff --git a/tools/snort2lua/keyword_states/kws_rule_state.cc b/tools/snort2lua/keyword_states/kws_rule_state.cc
index 622b16b2d..e93c6fd2e 100644
--- a/tools/snort2lua/keyword_states/kws_rule_state.cc
+++ b/tools/snort2lua/keyword_states/kws_rule_state.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace keywords
 {
@@ -83,7 +83,7 @@ bool RuleState::convert(std::istringstream& data_stream)
                 count++;
                 break;
             case 3:
-                ld->add_deprecated_comment("action");
+                ld->add_deleted_comment("action");
                 count++;
                 break;
             default:
diff --git a/tools/snort2lua/keyword_states/kws_ruletype.cc b/tools/snort2lua/keyword_states/kws_ruletype.cc
index 049fba1b1..f4de42dcf 100644
--- a/tools/snort2lua/keyword_states/kws_ruletype.cc
+++ b/tools/snort2lua/keyword_states/kws_ruletype.cc
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "config_states/config_api.h"
 
 
diff --git a/tools/snort2lua/keyword_states/kws_suppress.cc b/tools/snort2lua/keyword_states/kws_suppress.cc
index 6fe019652..226d83811 100644
--- a/tools/snort2lua/keyword_states/kws_suppress.cc
+++ b/tools/snort2lua/keyword_states/kws_suppress.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords
diff --git a/tools/snort2lua/keyword_states/kws_var.cc b/tools/snort2lua/keyword_states/kws_var.cc
index 2316a29b2..b19903a76 100644
--- a/tools/snort2lua/keyword_states/kws_var.cc
+++ b/tools/snort2lua/keyword_states/kws_var.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace keywords
diff --git a/tools/snort2lua/output_states/Makefile.am b/tools/snort2lua/output_states/Makefile.am
new file mode 100644
index 000000000..f44b3e8fe
--- /dev/null
+++ b/tools/snort2lua/output_states/Makefile.am
@@ -0,0 +1,21 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = liboutput_states.a
+
+liboutput_states_a_SOURCES = \
+out_csv.cc \
+out_fast.cc \
+out_full.cc \
+out_null.cc \
+out_tcpdump.cc \
+out_test.cc \
+out_syslog.cc \
+out_unified2.cc \
+out_unixsock.cc \
+output_api.h \
+output_api.cc
+
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+
diff --git a/tools/snort2lua/output_states/out_csv.cc b/tools/snort2lua/output_states/out_csv.cc
index b40567957..1a7d9ba45 100644
--- a/tools/snort2lua/output_states/out_csv.cc
+++ b/tools/snort2lua/output_states/out_csv.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
@@ -70,7 +70,7 @@ bool AlertCsv::convert(std::istringstream& data_stream)
         std::string new_val = std::string();
 
         if (!val.compare("default"))
-            ld->add_deprecated_comment("default");
+            ld->add_deleted_comment("default");
 
         else if (!val.compare("timestamp"))
             new_val = "timestamp";
diff --git a/tools/snort2lua/output_states/out_fast.cc b/tools/snort2lua/output_states/out_fast.cc
index 0ddcdfb31..c28cb2c81 100644
--- a/tools/snort2lua/output_states/out_fast.cc
+++ b/tools/snort2lua/output_states/out_fast.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_full.cc b/tools/snort2lua/output_states/out_full.cc
index bab6ccf08..fe4b81672 100644
--- a/tools/snort2lua/output_states/out_full.cc
+++ b/tools/snort2lua/output_states/out_full.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_null.cc b/tools/snort2lua/output_states/out_null.cc
index a5d0f25c6..5475f16e8 100644
--- a/tools/snort2lua/output_states/out_null.cc
+++ b/tools/snort2lua/output_states/out_null.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_syslog.cc b/tools/snort2lua/output_states/out_syslog.cc
index 11d96df0c..8fed39720 100644
--- a/tools/snort2lua/output_states/out_syslog.cc
+++ b/tools/snort2lua/output_states/out_syslog.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_tcpdump.cc b/tools/snort2lua/output_states/out_tcpdump.cc
index e8b604762..7883bfd5e 100644
--- a/tools/snort2lua/output_states/out_tcpdump.cc
+++ b/tools/snort2lua/output_states/out_tcpdump.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_test.cc b/tools/snort2lua/output_states/out_test.cc
index 034489f43..bd9ec14b9 100644
--- a/tools/snort2lua/output_states/out_test.cc
+++ b/tools/snort2lua/output_states/out_test.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_unified2.cc b/tools/snort2lua/output_states/out_unified2.cc
index 8e08b32c1..11f3ffd43 100644
--- a/tools/snort2lua/output_states/out_unified2.cc
+++ b/tools/snort2lua/output_states/out_unified2.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/output_states/out_unixsock.cc b/tools/snort2lua/output_states/out_unixsock.cc
index 89ce62086..08290abad 100644
--- a/tools/snort2lua/output_states/out_unixsock.cc
+++ b/tools/snort2lua/output_states/out_unixsock.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace output
 {
diff --git a/tools/snort2lua/preprocessor_states/Makefile.am b/tools/snort2lua/preprocessor_states/Makefile.am
new file mode 100644
index 000000000..f4738f179
--- /dev/null
+++ b/tools/snort2lua/preprocessor_states/Makefile.am
@@ -0,0 +1,27 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libpreprocessor_states.a
+
+libpreprocessor_states_a_SOURCES = \
+pps_arpspoof.cc \
+pps_bo.cc \
+pps_frag3_engine.cc \
+pps_frag3_global.cc \
+pps_ftp_telnet.cc \
+pps_ftp_telnet_protocol.cc \
+pps_gtp.cc \
+pps_http_inspect.cc \
+pps_http_inspect_server.cc \
+pps_normalizers.cc \
+pps_perfmonitor.cc \
+pps_rpc_decode.cc \
+pps_sfportscan.cc \
+pps_stream_ip.cc \
+pps_stream_global.cc \
+pps_stream_tcp.cc \
+pps_stream_udp.cc \
+preprocessor_api.h \
+preprocessor_api.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/preprocessor_states/pps_arpspoof.cc b/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
index 93f1c5c2c..2b671abaa 100644
--- a/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
+++ b/tools/snort2lua/preprocessor_states/pps_arpspoof.cc
@@ -22,8 +22,8 @@
 #include <sstream>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/preprocessor_states/pps_bo.cc b/tools/snort2lua/preprocessor_states/pps_bo.cc
index 2dcc222cf..d612b8d0e 100644
--- a/tools/snort2lua/preprocessor_states/pps_bo.cc
+++ b/tools/snort2lua/preprocessor_states/pps_bo.cc
@@ -24,8 +24,8 @@
 #include <iomanip>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 
 namespace preprocessors
diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
index 1270986f0..e240eaccb 100644
--- a/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
+++ b/tools/snort2lua/preprocessor_states/pps_frag3_engine.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -93,7 +93,7 @@ bool Frag3Engine::convert(std::istringstream& data_stream)
             tmpval = parse_string_option("policy", data_stream);
 
         else if(!keyword.compare("detect_anomalies"))
-            ld->add_deprecated_comment("detect_anomalies");
+            ld->add_deleted_comment("detect_anomalies");
 
         else if(!keyword.compare("bind_to"))
             parse_ip_list("bind_to", data_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_frag3_global.cc b/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
index e012664a3..c706e9608 100644
--- a/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
+++ b/tools/snort2lua/preprocessor_states/pps_frag3_global.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -60,7 +60,7 @@ bool Frag3Global::convert(std::istringstream& data_stream)
         args_stream >> keyword;
         
         if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("max_frags"))
             tmpval = parse_int_option("max_frags", args_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc b/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
index 2e97a33b4..d477c954a 100644
--- a/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
+++ b/tools/snort2lua/preprocessor_states/pps_ftp_telnet.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -63,10 +63,10 @@ void FtpTelnet::add_ftp_n_telnet_deprecated(std::istringstream& data_stream,
     std::string tmp;
     data_stream >> tmp;  // eat the next word
     ld->open_table("telnet");
-    ld->add_deprecated_comment(opt_name);
+    ld->add_deleted_comment(opt_name);
     ld->close_table();
     ld->open_table("ftp_server");
-    ld->add_deprecated_comment(opt_name);
+    ld->add_deleted_comment(opt_name);
     ld->close_table();
 }
 
@@ -84,7 +84,7 @@ bool FtpTelnet::convert(std::istringstream& data_stream)
     {
         if(keyword.compare("global"))
         {
-            cv->log_error("preprocessor ftp_telnet: requires the 'global' keyword");
+            ld->add_error_comment("preprocessor ftp_telnet: requires the 'global' keyword");
             return false;
         }
     }
diff --git a/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc b/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
index a553afcea..f8af5c354 100644
--- a/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
+++ b/tools/snort2lua/preprocessor_states/pps_ftp_telnet_protocol.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/preprocessor_states/pps_gtp.cc b/tools/snort2lua/preprocessor_states/pps_gtp.cc
index fad2f0c89..9d9c41bd3 100644
--- a/tools/snort2lua/preprocessor_states/pps_gtp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_gtp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
index 897554464..e2bab87c6 100644
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
@@ -24,8 +24,8 @@
 #include <string>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -61,7 +61,7 @@ bool HttpInspect::convert(std::istringstream& data_stream)
     {
         if(keyword.compare("global"))
         {
-            cv->log_error("preprocessor httpinspect: requires the 'global' keyword");
+            ld->add_error_comment("preprocessor httpinspect: requires the 'global' keyword");
             return false;
         }
     }
@@ -95,7 +95,7 @@ bool HttpInspect::convert(std::istringstream& data_stream)
             tmpval = parse_int_option("chunk_length", data_stream);
         
         else if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("b64_decode_depth"))
             tmpval = add_decode_option("b64_decode_depth", data_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
index 239b180d6..8e8eeccb2 100644
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -214,7 +214,7 @@ bool HttpInspectServer::convert(std::istringstream& data_stream)
             tmpval = parse_int_option("max_headers", data_stream);
 
         else if (!keyword.compare("no_alerts"))
-            ld->add_deprecated_comment("no_alerts");
+            ld->add_deleted_comment("no_alerts");
 
         else if (!keyword.compare("decompress_swf"))
             tmpval = parse_bracketed_unsupported_list("decompress_swf", data_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_normalizers.cc b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
index 580af8807..3ca143904 100644
--- a/tools/snort2lua/preprocessor_states/pps_normalizers.cc
+++ b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
@@ -24,8 +24,8 @@
 #include <iomanip>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc b/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
index f6f0118f3..ae091fa2f 100644
--- a/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
+++ b/tools/snort2lua/preprocessor_states/pps_perfmonitor.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -91,19 +91,19 @@ bool PerfMonitor::convert(std::istringstream& data_stream)
             tmpval = ld->add_option_to_table("reset", true);
 
         else if (!keyword.compare("atexitonly"))
-            ld->add_deprecated_comment("atexitonly");
+            ld->add_deleted_comment("atexitonly");
 
         else if (!keyword.compare("base-stats"))
-            ld->add_deprecated_comment("atexitonly: base-stats");
+            ld->add_deleted_comment("atexitonly: base-stats");
 
         else if (!keyword.compare("flow-stats"))
-            ld->add_deprecated_comment("atexitonly: flow-stats");
+            ld->add_deleted_comment("atexitonly: flow-stats");
 
         else if (!keyword.compare("flow-ip-stats"))
-            ld->add_deprecated_comment("atexitonly: flow-ip-stats");
+            ld->add_deleted_comment("atexitonly: flow-ip-stats");
 
         else if (!keyword.compare("events-stats"))
-            ld->add_deprecated_comment("atexitonly: events-stats");
+            ld->add_deleted_comment("atexitonly: events-stats");
 
         else if (!keyword.compare("max_file_size"))
             tmpval = parse_int_option("max_file_size", data_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc b/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
index a484ecfb1..dc0bee07c 100644
--- a/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
+++ b/tools/snort2lua/preprocessor_states/pps_rpc_decode.cc
@@ -24,8 +24,8 @@
 #include <string>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -56,16 +56,16 @@ bool RpcDecode::convert(std::istringstream& data_stream)
         bool tmpval = true;
 
         if(!keyword.compare("no_alert_multiple_requests"))
-            ld->add_deprecated_comment("no_alert_multiple_requests");
+            ld->add_deleted_comment("no_alert_multiple_requests");
 
         else if(!keyword.compare("alert_fragments"))
-            ld->add_deprecated_comment("alert_fragments");
+            ld->add_deleted_comment("alert_fragments");
 
         else if(!keyword.compare("no_alert_large_fragments"))
-            ld->add_deprecated_comment("no_alert_large_fragments");
+            ld->add_deleted_comment("no_alert_large_fragments");
 
         else if(!keyword.compare("no_alert_incomplete"))
-            ld->add_deprecated_comment("no_alert_incomplete");
+            ld->add_deleted_comment("no_alert_incomplete");
 
         else if (isdigit(keyword[0]))
             port_list += ' ' + keyword;
diff --git a/tools/snort2lua/preprocessor_states/pps_sfportscan.cc b/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
index b5532eb16..f9347202e 100644
--- a/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
+++ b/tools/snort2lua/preprocessor_states/pps_sfportscan.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -148,16 +148,16 @@ bool PortScan::convert(std::istringstream& data_stream)
             tmpval = ld->add_option_to_table("include_midstream", true);
 
         else if(!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if(!keyword.compare("detect_ack_scans"))
-            ld->add_deprecated_comment("detect_ack_scans");
+            ld->add_deleted_comment("detect_ack_scans");
 
         else if(!keyword.compare("logfile"))
         {
             if (!util::get_string(data_stream, keyword, "}"))
                 tmpval = false;
-            ld->add_deprecated_comment("logfile");
+            ld->add_deleted_comment("logfile");
         }
 
         else if(!keyword.compare("memcap"))
diff --git a/tools/snort2lua/preprocessor_states/pps_stream_global.cc b/tools/snort2lua/preprocessor_states/pps_stream_global.cc
index 8985e5973..385a917a3 100644
--- a/tools/snort2lua/preprocessor_states/pps_stream_global.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_global.cc
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -60,16 +60,16 @@ bool StreamGlobal::convert(std::istringstream& data_stream)
             tmpval = false;
 
         else if (!keyword.compare("flush_on_alert"))
-            ld->add_deprecated_comment("flush_on_alert");
+            ld->add_deleted_comment("flush_on_alert");
 
         else if (!keyword.compare("disabled"))
-            ld->add_deprecated_comment("disabled");
+            ld->add_deleted_comment("disabled");
 
         else if (!keyword.compare("enable_ha"))
             ld->add_unsupported_comment("enable_ha");
 
         else if (!keyword.compare("no_midstream_drop_alerts"))
-            ld->add_deprecated_comment("no_midstream_drop_alerts");
+            ld->add_deleted_comment("no_midstream_drop_alerts");
 
         else if (!keyword.compare("track_tcp"))
             tmpval = parse_deleted_option("track_tcp", arg_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_stream_ip.cc b/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
index dbfe53e78..a70cabbd6 100644
--- a/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_ip.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
index 137f480a4..3c677a89a 100644
--- a/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_tcp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
@@ -199,13 +199,13 @@ bool StreamTcp::convert(std::istringstream& data_stream)
             tmpval = parse_ports(arg_stream);
 
         else if (!keyword.compare("detect_anomalies"))
-            ld->add_deprecated_comment("detect_anomalies");
+            ld->add_deleted_comment("detect_anomalies");
 
         else if (!keyword.compare("dont_store_large_packets"))
-            ld->add_deprecated_comment("dont_store_large_packets");
+            ld->add_deleted_comment("dont_store_large_packets");
 
         else if (!keyword.compare("check_session_hijacking"))
-            ld->add_deprecated_comment("check_session_hijacking");
+            ld->add_deleted_comment("check_session_hijacking");
 
         else if (!keyword.compare("flush_factor"))
             tmpval = parse_int_option("flush_factor", arg_stream);
diff --git a/tools/snort2lua/preprocessor_states/pps_stream_udp.cc b/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
index fc626b205..f1fca9d4f 100644
--- a/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
+++ b/tools/snort2lua/preprocessor_states/pps_stream_udp.cc
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
-#include "util/util.h"
+#include "utils/converter.h"
+#include "utils/snort2lua_util.h"
 
 namespace preprocessors
 {
diff --git a/tools/snort2lua/rule_states/Makefile.am b/tools/snort2lua/rule_states/Makefile.am
new file mode 100644
index 000000000..b675de337
--- /dev/null
+++ b/tools/snort2lua/rule_states/Makefile.am
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = librule_states.a
+
+librule_states_a_SOURCES = \
+rule_base64_decode.cc \
+rule_content.cc \
+rule_file_data.cc \
+rule_http_encode.cc \
+rule_metadata.cc \
+rule_pcre.cc \
+rule_unchanged.cc \
+rule_urilen.cc \
+rule_api.cc \
+rule_api.h
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/rule_states/rule_api.cc b/tools/snort2lua/rule_states/rule_api.cc
index 3a6fc9866..dcc2c4dad 100644
--- a/tools/snort2lua/rule_states/rule_api.cc
+++ b/tools/snort2lua/rule_states/rule_api.cc
@@ -21,8 +21,8 @@
 
 #include <string>
 #include "rule_states/rule_api.h"
-#include "util/util.h"
-#include "util/converter.h"
+#include "utils/snort2lua_util.h"
+#include "utils/converter.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_base64_decode.cc b/tools/snort2lua/rule_states/rule_base64_decode.cc
index 9123d7b88..6d3909af2 100644
--- a/tools/snort2lua/rule_states/rule_base64_decode.cc
+++ b/tools/snort2lua/rule_states/rule_base64_decode.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_content.cc b/tools/snort2lua/rule_states/rule_content.cc
index f5a3db11f..2bd45c9e0 100644
--- a/tools/snort2lua/rule_states/rule_content.cc
+++ b/tools/snort2lua/rule_states/rule_content.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_file_data.cc b/tools/snort2lua/rule_states/rule_file_data.cc
index d9d548cc2..573fec3dc 100644
--- a/tools/snort2lua/rule_states/rule_file_data.cc
+++ b/tools/snort2lua/rule_states/rule_file_data.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_http_encode.cc b/tools/snort2lua/rule_states/rule_http_encode.cc
index 8acb9c72d..b4f3e85ed 100644
--- a/tools/snort2lua/rule_states/rule_http_encode.cc
+++ b/tools/snort2lua/rule_states/rule_http_encode.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_metadata.cc b/tools/snort2lua/rule_states/rule_metadata.cc
index 21655484c..911c965ef 100644
--- a/tools/snort2lua/rule_states/rule_metadata.cc
+++ b/tools/snort2lua/rule_states/rule_metadata.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_pcre.cc b/tools/snort2lua/rule_states/rule_pcre.cc
index 2a04c97d9..760753b90 100644
--- a/tools/snort2lua/rule_states/rule_pcre.cc
+++ b/tools/snort2lua/rule_states/rule_pcre.cc
@@ -24,9 +24,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_unchanged.cc b/tools/snort2lua/rule_states/rule_unchanged.cc
index d783e9535..25e0ca4f6 100644
--- a/tools/snort2lua/rule_states/rule_unchanged.cc
+++ b/tools/snort2lua/rule_states/rule_unchanged.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/rule_states/rule_urilen.cc b/tools/snort2lua/rule_states/rule_urilen.cc
index 79713f8c5..8ac536139 100644
--- a/tools/snort2lua/rule_states/rule_urilen.cc
+++ b/tools/snort2lua/rule_states/rule_urilen.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "conversion_state.h"
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "rule_states/rule_api.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 
 namespace rules
 {
diff --git a/tools/snort2lua/snort2lua.cc b/tools/snort2lua/snort2lua.cc
index 1ef2b83b6..e1cfa8b20 100644
--- a/tools/snort2lua/snort2lua.cc
+++ b/tools/snort2lua/snort2lua.cc
@@ -22,9 +22,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "init_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "option_parser.h"
 
 
diff --git a/tools/snort2lua/util/CMakeLists.txt b/tools/snort2lua/util/CMakeLists.txt
deleted file mode 100644
index e1fb438e4..000000000
--- a/tools/snort2lua/util/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-add_library( util
-    converter.h
-    converter.cc
-    util.h
-    util.cc
-)
-
-target_link_libraries( util
-    conversion_data
-)
diff --git a/tools/snort2lua/utils/CMakeLists.txt b/tools/snort2lua/utils/CMakeLists.txt
new file mode 100644
index 000000000..30854b1dd
--- /dev/null
+++ b/tools/snort2lua/utils/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+
+add_library( snort2lua_utils
+    converter.h
+    converter.cc
+    snort2lua_util.h
+    snort2lua_util.cc
+)
+
+target_link_libraries( snort2lua_utils
+    conversion_data
+)
diff --git a/tools/snort2lua/utils/Makefile.am b/tools/snort2lua/utils/Makefile.am
new file mode 100644
index 000000000..730e9db2c
--- /dev/null
+++ b/tools/snort2lua/utils/Makefile.am
@@ -0,0 +1,12 @@
+AUTOMAKE_OPTIONS=foreign no-dependencies
+
+
+noinst_LIBRARIES = libsnort2lua_utils.a
+
+libsnort2lua_utils_a_SOURCES = \
+converter.h \
+converter.cc \
+snort2lua_util.h \
+snort2lua_util.cc
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
diff --git a/tools/snort2lua/util/converter.cc b/tools/snort2lua/utils/converter.cc
similarity index 82%
rename from tools/snort2lua/util/converter.cc
rename to tools/snort2lua/utils/converter.cc
index 6ddd77e12..da85e5c0f 100644
--- a/tools/snort2lua/util/converter.cc
+++ b/tools/snort2lua/utils/converter.cc
@@ -20,9 +20,9 @@
 // converter.cc author Josh Rosenbaum <jorosenba@cisco.com>
 
 #include <iostream>
-#include "util/converter.h"
+#include "utils/converter.h"
 #include "conversion_state.h"
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "data/dt_comment.h"
 
 
@@ -184,11 +184,11 @@ int Converter::convert_file(std::string input_file)
         {
             orig_text += tmp;
             std::istringstream data_stream(orig_text);
-            while(data_stream.peek() != std::char_traits<wchar_t>::eof())
+            while(data_stream.peek() != EOF)
             {
                 if ((state == nullptr) || !state->convert(data_stream))
                 {
-                    log_error("Failed to entirely convert: " + orig_text);
+                    ld->add_error_comment("Failed to entirely convert: " + orig_text);
                     break;
                 }
             }
@@ -201,48 +201,3 @@ int Converter::convert_file(std::string input_file)
     // this is set by parse_include_file
     return error ? -3 : 0;
 }
-
-/*******************************
- *******  PRINTING FOO *********
- *******************************/
-
-void Converter::log_error(std::string error_string)
-{
-    ld->add_error_comment(error_string);
-//    std::cout << "ERROR: Failed to convert:\t" << std::endl;
-//    std::cout << "\t\t" << error_string << std::endl << std::endl;
-}
-
-void Converter::print_line(std::istringstream& in)
-{
-    int pos = in.tellg();
-    std::ostringstream oss;
-    oss << in.rdbuf();
-    std::cout << "DEBUG: " << oss.str() << std::endl;
-    in.seekg(pos);
-}
-
-void Converter::print_line(std::ostringstream& in)
-{
-    std::cout << "DEBUG: " << in.str() << std::endl;
-}
-void Converter::print_line(std::string& in)
-{
-    std::cout << "DEBUG: " << in << std::endl;
-}
-
-#if 0
-
-void Converter::inititalize()
-{
-		state = this;
-}
-
-
-
-void Converter::set_state(Converter* c){ 
-    delete state;
-    state = c; 
-}
-
-#endif
diff --git a/tools/snort2lua/util/converter.h b/tools/snort2lua/utils/converter.h
similarity index 83%
rename from tools/snort2lua/util/converter.h
rename to tools/snort2lua/utils/converter.h
index 3cbd3f9a3..94cd37067 100644
--- a/tools/snort2lua/util/converter.h
+++ b/tools/snort2lua/utils/converter.h
@@ -62,21 +62,8 @@ public:
     int convert_file(std::string input_file);
     // parse an include file.  Use this function to ensure all set options are properly
     void parse_include_file(std::string file);
-    // convert an include file. This function initializes structure which are kept seperate between files.
-//    void convert_include_files(std::string input_file);
     // Should we parse an include file?
     inline bool should_convert_includes() { return parse_includes; }
-    // prints the entire lua configuration to the output file.
-//    friend std::ostream &operator<<( std::ostream& out, const Converter &cv) { return out << (*(cv.ld)); }
-
-
-
-    // log an error in the new lua file
-    void log_error(std::string);
-
-    void print_line(std::istringstream& in);
-    void print_line(std::ostringstream& in);
-    void print_line(std::string& in);
 
 private:
     // the current parsing state.
diff --git a/tools/snort2lua/util/util.cc b/tools/snort2lua/utils/snort2lua_util.cc
similarity index 99%
rename from tools/snort2lua/util/util.cc
rename to tools/snort2lua/utils/snort2lua_util.cc
index 0d89823a6..1c8272a06 100644
--- a/tools/snort2lua/util/util.cc
+++ b/tools/snort2lua/utils/snort2lua_util.cc
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <iostream>
 #include <string>
-#include "util/util.h"
+#include "utils/snort2lua_util.h"
 #include "conversion_state.h"
 
 namespace util
diff --git a/tools/snort2lua/util/util.h b/tools/snort2lua/utils/snort2lua_util.h
similarity index 100%
rename from tools/snort2lua/util/util.h
rename to tools/snort2lua/utils/snort2lua_util.h