reorg of dir structure and filenames