Switch to singular naming convention for all files and dirs