Clean up File Directory
Merge branch 'master' into modal