Directory structure changes, a work in progress. See mailing list for details