Restructuring Rakefile