Fix use of getDirectoryContents again
Simplify
Rename