Remove Old Files
Fixes #243
Corrects Class wording and fixes some copied code to us are filter.
Merge pull request #249 from bcordis/master

Fixes #243