refactor www and www-src