Refactoring the genie 2 client code to have common base class in the common project. This way the client package and the server packages can both use it and we can stop modifying code in two places