Clean up class structure and un-entity Clients on the server, also added promise logic to local client to handle command responses by the server