update site root, merge Rakefile and Rakefile.rb