Reworked structure for rst.