Re-organizing RRD objects.
Re-organizing RRD objects (Part II).