directory hierarchy cleanup