Express and Socket.io file structure
Merged conflicts fixed in README.md