Reorg in misc/