Replaced web.xml with servlet annotations