re-organized comments plugin section