A combinatorial approach to geometric rough paths and their controlled paths