Removed some files and fixed pluralization bug