Refactored into server and client
Remove Class module