reorg/rename and deletion to standardize naming