Reorganize modules / directory structure

This breaks the "tests".