[Changed] project structure to servlet-based