Add rerun and reorganize Gemfile.tt
Update Rakefile