Did more site-based cleanup, and added a deployment descriptor.