I have a site with hundreds of pages and I have redesigned the site, changed the files from html to php and also put files in new folders. Therefore I need to redirect all of my pages on an individual basis. Is the following example code for the .htaccess file correct for this purpose?:

Redirect 301 /main.html http://www.mysite.com/main.php
Redirect 301 /webdesign.html http://www.mysite.com/web-design.php
Redirect 301 /companyhistory.html http://www.mysite.com/folder/company-history.php

Is this the best way to make sure the search engine rankings transfer to the new pages as well?

Thanks so much for any help.