Unify modules - see issue #8 for details

This removes the need for ant?