Update Rakefile

More fixes related to file names and directory paths