If you're going to change the namespacing of the providers, can you do that in a separate patch?

Also, we'd like the source tree to reflect the internal namespace hierarchy when possible, so changing Chef::Provider::CookbookFile to Chef::Provider::File::CookbookFile should also include a mv to lib/chef/provider/file/cookbook_file.rb