Refactored server

and fixed package/import in client part from previous commit