Restructed in preparation for inclusion in update-site and continuous
builds. NOTE: best to re-import Eclipse project from the updated git
working copy, rather than pull from within Eclipse, as Eclipse projects
have been added and existing one has moved.