Organizing and Nodoc updates