Cleaned directory and file names