Moved the servlet configuration into the @ContainerConfiguration annotation and deleted the @Servlets annotation.
Removed some Filter code that got into the Constants class before it's time.