misc reorg/rename