Refactored default servlet and added StaticServlet for better static file handling
Minor updates