Removed more useless files.
Merge branch 'directory-cleanup' into broken-resources