Server:
Moved around servlet stuff so that the manger servlet would work again.