web.xml and Controller refactor