Start testing

Restructured non-core source code and started on a test suite (with a view to having coverage in place in a later release)