restructure rakefile