refactoring completed, added moment and crypto to server