Shifting around some dependencies, updating web.xml