Reorganising module. Stubbed test suite. Stubbed CLI.