changed some directories and updated Rakefile