diff --git a/go-junit-report.go b/go-junit-report.go
index b003e2e..bf388b0 100644
--- a/go-junit-report.go
+++ b/go-junit-report.go
@@ -4,6 +4,8 @@ import (
 	"flag"
 	"fmt"
 	"os"
+
+	"github.com/jstemmer/go-junit-report/parser"
 )
 
 var (
@@ -22,7 +24,7 @@ func main() {
 	flag.Parse()
 
 	// Read input
-	report, err := Parse(os.Stdin, packageName)
+	report, err := parser.Parse(os.Stdin, packageName)
 	if err != nil {
 		fmt.Printf("Error reading input: %s\n", err)
 		os.Exit(1)
diff --git a/junit-formatter.go b/junit-formatter.go
index e247612..7e09fdd 100644
--- a/junit-formatter.go
+++ b/junit-formatter.go
@@ -7,6 +7,8 @@ import (
 	"io"
 	"runtime"
 	"strings"
+
+	"github.com/jstemmer/go-junit-report/parser"
 )
 
 // JUnitTestSuites is a collection of JUnit test suites.
@@ -57,7 +59,7 @@ type JUnitFailure struct {
 
 // JUnitReportXML writes a JUnit xml representation of the given report to w
 // in the format described at http://windyroad.org/dl/Open%20Source/JUnit.xsd
-func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
+func JUnitReportXML(report *parser.Report, noXMLHeader bool, w io.Writer) error {
 	suites := JUnitTestSuites{}
 
 	// convert Report to JUnit test suites
@@ -88,7 +90,7 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
 				Failure:   nil,
 			}
 
-			if test.Result == FAIL {
+			if test.Result == parser.FAIL {
 				ts.Failures++
 				testCase.Failure = &JUnitFailure{
 					Message:  "Failed",
@@ -97,7 +99,7 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
 				}
 			}
 
-			if test.Result == SKIP {
+			if test.Result == parser.SKIP {
 				testCase.SkipMessage = &JUnitSkipMessage{strings.Join(test.Output, "\n")}
 			}
 
@@ -126,9 +128,9 @@ func JUnitReportXML(report *Report, noXMLHeader bool, w io.Writer) error {
 	return nil
 }
 
-func countFailures(tests []Test) (result int) {
+func countFailures(tests []parser.Test) (result int) {
 	for _, test := range tests {
-		if test.Result == FAIL {
+		if test.Result == parser.FAIL {
 			result++
 		}
 	}
diff --git a/parser.go b/parser/parser.go
similarity index 99%
rename from parser.go
rename to parser/parser.go
index 978abe9..abdac8c 100644
--- a/parser.go
+++ b/parser/parser.go
@@ -1,4 +1,4 @@
-package main
+package parser
 
 import (
 	"bufio"