cover creation / graph creation classes restructuring