enhance Rakefile, better dir structure