Added the SO_TIMEOUT handling
o Removed ignored files
Moved the fileds on top of the file