moved client code into server module, changed server module back to war packaging, simple tests are all passing.