Reorganised source tree.  Updated build mechanism.