IssueID #16
Refactor the structure for express and socket.io