web.xml and various other classes refactoring