Moved server files to server/ directory
Merge branch 'master' of https://github.com/rbellido/fuzzy-hipster