diff --git a/Parser.h b/Parser.h
index 72b84e8..8f489cc 100644
--- a/Parser.h
+++ b/Parser.h
@@ -22,6 +22,7 @@ class Parser
             m_rules.push_back(rd);
         }
         void write(const std::string & fname);
+        bool parseInputFile(char * buff, int size);
 
     protected:
         std::vector< refptr< TokenDefinition > > m_tokens;
diff --git a/parse-input.cc b/Parser_parseInputFile.cc
similarity index 96%
rename from parse-input.cc
rename to Parser_parseInputFile.cc
index 67c136c..17edcb4 100644
--- a/parse-input.cc
+++ b/Parser_parseInputFile.cc
@@ -7,15 +7,15 @@
 #include <map>
 #include <pcre.h>
 
-#include "parse-input.h"
-#include "TokenDefinition.h"
 #include "Parser.h"
+#include "TokenDefinition.h"
+#include "RuleDefinition.h"
 
 using namespace std;
 
 enum Section{ none, tokens, rules };
 
-bool parse_input(char * buff, int size, Parser & parser)
+bool Parser::parseInputFile(char * buff, int size)
 {
     pcre * empty;
     pcre * comment;
@@ -131,7 +131,7 @@ bool parse_input(char * buff, int size, Parser & parser)
                         refptr<TokenDefinition> td = new TokenDefinition();
                         if (td->create(name, definition, flags))
                         {
-                            parser.addTokenDefinition(td);
+                            addTokenDefinition(td);
                         }
                         else
                         {
@@ -156,7 +156,7 @@ bool parse_input(char * buff, int size, Parser & parser)
                         refptr<RuleDefinition> rd = new RuleDefinition();
                         if (rd->create(name, definition))
                         {
-                            parser.addRuleDefinition(rd);
+                            addRuleDefinition(rd);
                         }
                         else
                         {
diff --git a/imbecile.cc b/imbecile.cc
index daff482..9895506 100644
--- a/imbecile.cc
+++ b/imbecile.cc
@@ -5,7 +5,7 @@
 #include <fstream>
 
 #include "refptr/refptr.h"
-#include "parse-input.h"
+#include "Parser.h"
 
 using namespace std;
 
@@ -48,7 +48,7 @@ int main(int argc, char * argv[])
 
     Parser p;
 
-    parse_input(buff, size, p);
+    p.parseInputFile(buff, size);
 
     if (output_fname == "")
     {
diff --git a/parse-input.h b/parse-input.h
deleted file mode 100644
index ea37f03..0000000
--- a/parse-input.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifndef PARSE_INPUT_H
-#define PARSE_INPUT_H
-
-#include <vector>
-
-#include "refptr/refptr.h"
-#include "Parser.h"
-
-bool parse_input(char * buff, int size, Parser & parser);
-
-#endif