Move client methods into simple module from package.