Update guidelines
Move things back out of doc