Yet another reorganization, but we now got cabal integration for test suite stuff and it works well enough