Refactored server code
Improved readme