Rearranged structure and added socket.io-client