Multi module

This fixes issue #8