Moved requirements 3.13, 3.20, 3.21 to requirements 8.1, 8.2, 8.3
respectively.  Also renumbered section 3 requirements accordingly.