modify directory names
remove verbose comments
add new alias for safe remove