removing duplicated libraries (using from client implementation)
restructuring server code