Moved classes around in packages
Removed FilterRemover; not used anymore