Moved server into a module
Readme changes