SocketIO Integration
Merge branch 'feature/structure' into develop