Add Servlet class and Refactor files