Shortened the package name, no need to include the "infestation" bit
everywhere.
Fixed up some of the class names.