Fixed naming

Deleted old files.  Added \r to blacklist