REFACTOR to add servlet in a separate repo
REMOVE deleted files