Move comments to the correct section