Server-side code cleanup and organization.
Merge branch 'master' of github.com:adam-bratin/nihilism