reorg paths for testing