moved client code to different package