Fix Comments and  Source File Organization section.