Restructure dir in Birth/Death