Reorganised existing files.  Initiated testable module.