Small style update
Restructure changes, also trying to get socket.io to work