separate servlets; add stub REST endpoints
fix specs