Refactoring files organization
Improved SocketSession
Merge branch 'develop'