Small improvements to Rakefile and dir structure