Refactored all features into one servlet.
Recovered from mistakenly commiting tabs instead of spaces ;)