Restructured files into two packages and added an __init__.py to each.
Moved to a package model.
Altered tests to make use of installed package rather than base files.