Started refactoring the basic server setup.