Refactoring/adding simple server