reorg of packages/filenames