reorg of file structure