Moved servlets and services to separate packages

Change-Id: I5f0f50f4ae7d332e9f724a2e6f074fa71f646035
47 files changed