Rakefile overhaul