First step towards modularity / configurability.
Moved tests to reflect implementation namespace.