Unify modules - see issue #8 for details