rakefile and adjustments of other files