Rakefile is improved and adjusted to the current directory structure.