Added wrapper script for expat
Re-integrated all modules

But left samples in-tree for now