Unstable into Testing

Major code organisation changes. Fixes #16