diff --git a/pytimeparse/__init__.py b/pytimeparse/__init__.py
index 43efa8d..8abad38 100644
--- a/pytimeparse/__init__.py
+++ b/pytimeparse/__init__.py
@@ -25,4 +25,4 @@ except IOError as ex:
     __version__ = "unknown (%s)" % ex
 
 # import top-level functionality
-from .timeparse import timeparse
+from .timeparse import timeparse as parse
diff --git a/pytimeparse/tests/__init__.py b/pytimeparse/tests/__init__.py
new file mode 100644
index 0000000..2096730
--- /dev/null
+++ b/pytimeparse/tests/__init__.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+'''
+__init__.py
+(c) Will Roberts  18 February, 2015
+
+pytimeparse.tests module
+'''
diff --git a/pytimeparse/testtimeparse.py b/pytimeparse/tests/testtimeparse.py
similarity index 99%
rename from pytimeparse/testtimeparse.py
rename to pytimeparse/tests/testtimeparse.py
index 1a13706..c305bb5 100644
--- a/pytimeparse/testtimeparse.py
+++ b/pytimeparse/tests/testtimeparse.py
@@ -8,9 +8,10 @@ testtimeparse.py
 Unit tests for the `timeparse` module.
 '''
 
+from __future__ import absolute_import
 import doctest
 import re
-from pytimeparse import timeparse
+from .. import timeparse
 import unittest
 
 class TestTimeparse(unittest.TestCase):