Move Client spec into correct folder scope