All sorts of changes to remove the Spring MVC stuff and use Servlets instead because something about AWS is wacked with it