file reorg, pathnames.h, paths.h; some reformatting