Integrated previous Servlets, refactored packages