Spitted client to builder and exception packages