Updated project structure, included support for Java Servlet API