rearranged tasks in Rakefile