Move group block to standalone partial