Another reorganization, adding comments.