Update and reorganization of the rool.