[WIP] Rearrange module hierarchy

An experimental change in the class/module hierarchy to
make things easier