Refactoring in server, CmakeLists.txt added
CMakeLists.txt