Organize lib
Organize Server class
Merge remote-tracking branch 'origin/dev'