Re did the web site again
Well, an update to Drupal prevented me from entering new portfolio items, so I migrated the main site to WordPress. Mad it much easier to have the themes look the same as I can actually use the same theme. As for the portfolio, I am now using the Types plugin which allows me to create and maintain custom post types and taxonomies easily. I will next work on moving the blog into the main instance.
I now have downloads. At the moment, this is a static page but I will also work to make it part of WordPress.