1) rename class names
2) add servlet config and generic servlet sample