Tidying up directory names