Move grunt stuff into the correct client