Added servlet part

Change-Id: I1dccde4dcbb1f8507b51e77b31b4160f0de91891