some reorganization of the outorg.el file.