Directory reorg; scripts generalized.