rearange the files structure
Merge remote-tracking branch 'socket/master'