reorg file structure for test