Server refactor

Moved stuff into correct packages. Nothing major.
Deleted error page because it's annoying.