Refactoring: Started to spit WSclient into rover and controller