Final checkin for improving directory structure.