Moving the nullclient to its own file within the builder package